public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

due to new upstart version, vm tests didn't work anymore 

svn path=/nixos/trunk/; revision=18840
This commit is contained in:
Rob Vermaas 2009-12-08 11:41:21 +00:00
parent 12401536fc
commit ed6d8c6881
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/test-driver/Machine.pm
View File

@ -180,7 +180,7 @@ sub waitForJob {
my ($self, $jobName) = @_;
while (1) {
my ($status, $out) = $self->execute("initctl status $jobName");
return if $out =~ /\(start\)\s+running/;
return if $out =~ /start\/running/;
sleep 1;
# !!! need a timeout
}
@ -204,7 +204,7 @@ sub stopJob {
$self->execute("initctl stop $jobName");
while (1) {
my ($status, $out) = $self->execute("initctl status $jobName");
return if $out =~ /\(stop\)\s+waiting/;
return if $out =~ /stop\/waiting/;
sleep 1;
# !!! need a timeout
}

2
modules/testing/test-instrumentation.nix
View File

@ -10,7 +10,7 @@ with pkgs.lib;
config = {
jobs.backdoor =
{ startOn = "network-interfaces";
{ startOn = "started network-interfaces";
preStart =
''