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

Test driver: exit when all VMs have exited rather than sleeping forever

This commit is contained in:
Eelco Dolstra 2012-06-22 14:31:07 -04:00
parent 1da7cea223
commit 82019c01bb
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/test-driver/test-driver.pl
View File

@ -68,6 +68,14 @@ sub startAll {
} }
# Wait until all VMs have terminated.
sub joinAll {
$log->nest("waiting for all VMs to finish", sub {
$_->waitForShutdown foreach values %vms;
});
}
# In interactive tests, this allows the non-interactive test script to # In interactive tests, this allows the non-interactive test script to
# be executed conveniently. # be executed conveniently.
sub testScript { sub testScript {

2
lib/testing.nix
View File

@ -157,7 +157,7 @@ rec {
ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms
wrapProgram $out/bin/nixos-run-vms \ wrapProgram $out/bin/nixos-run-vms \
--add-flags "$vms" \ --add-flags "$vms" \
--set tests '"startAll; sleep 1e9;"' \ --set tests '"startAll; joinAll;"' \
--set VLANS '"${toString vlans}"' --set VLANS '"${toString vlans}"'
''; # " ''; # "