commit ad29b726866b5abeed9ad05cad52995295cf4813 · pyrox.dev/nixpkgs

+10 -2
nixos/lib/test-driver/Machine.pm
···

       382
       382
        
                   my $state = $info->{ActiveState};

     

       383
       383
        
                   die "unit ‘$unit’ reached state ‘$state’\n" if $state eq "failed";

     

       384
       384
        
                   if ($state eq "inactive") {

     

       385
       385
       +
                       # If there are no pending jobs, then assume this unit

     

       386
       386
       +
                       # will never reach active state.

     

       385
       387
        
                       my ($status, $jobs) = $self->execute("systemctl list-jobs --full 2>&1");

     

       386
       386
       -
                       die "unit ‘$unit’ is inactive and there are no pending jobs\n"

     

       387
       387
       -
                           if $jobs =~ /No jobs/; # FIXME: fragile

     

       388
       388
       +
                       if ($jobs =~ /No jobs/) {  # FIXME: fragile

     

       389
       389
       +
                           # Handle the case where the unit may have started

     

       390
       390
       +
                           # between the previous getUnitInfo() and

     

       391
       391
       +
                           # list-jobs.

     

       392
       392
       +
                           my $info2 = $self->getUnitInfo($unit);

     

       393
       393
       +
                           die "unit ‘$unit’ is inactive and there are no pending jobs\n"

     

       394
       394
       +
                               if $info2->{ActiveState} eq $state;

     

       395
       395
       +
                       }

     

       388
       396
        
                   }

     

       389
       397
        
                   return 1 if $state eq "active";

     

       390
       398
        
               };