alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

test-driver: Fix "unit X is inactive and there are no pending jobs"

Browse source 
This was causing many random test failures.
This commit is contained in:
Eelco Dolstra 2016-05-24 16:33:14 +02:00
parent 5420f7f6e0
commit ad29b72686
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
nixos/lib/test-driver/Machine.pm
View file

@ -382,9 +382,17 @@ sub waitForUnit {
my $state = $info->{ActiveState}; my $state = $info->{ActiveState};
die "unit ‘$unit’ reached state ‘$state’\n" if $state eq "failed"; die "unit ‘$unit’ reached state ‘$state’\n" if $state eq "failed";
if ($state eq "inactive") { if ($state eq "inactive") {
# If there are no pending jobs, then assume this unit
# will never reach active state.
my ($status, $jobs) = $self->execute("systemctl list-jobs --full 2>&1"); my ($status, $jobs) = $self->execute("systemctl list-jobs --full 2>&1");
die "unit ‘$unit’ is inactive and there are no pending jobs\n" if ($jobs =~ /No jobs/) { # FIXME: fragile
if $jobs =~ /No jobs/; # FIXME: fragile # Handle the case where the unit may have started
# between the previous getUnitInfo() and
# list-jobs.
my $info2 = $self->getUnitInfo($unit);
die "unit ‘$unit’ is inactive and there are no pending jobs\n"
if $info2->{ActiveState} eq $state;
}
} }
return 1 if $state eq "active"; return 1 if $state eq "active";
}; };