Author: sandervanderburg
Date: Sun Dec 19 15:24:33 2010
New Revision: 25200
URL: https://svn.nixos.org/websvn/nix/?rev=25200&sc=1
Log:
It seems that the network interfaces may also be down before starting the
tests, so we should also wait for those
Modified:
disnix/disnixos/trunk/data/testing.nix.in
Modified: disnix/disnixos/trunk/data/testing.nix.in
==============================================================================
--- disnix/disnixos/trunk/data/testing.nix.in Sun Dec 19 14:59:26 2010
(r25199)
+++ disnix/disnixos/trunk/data/testing.nix.in Sun Dec 19 15:24:33 2010
(r25200)
@@ -100,9 +100,11 @@
${lib.concatMapStrings (targetName:
''
+ ${"\$"}${targetName}->waitForJob("network-interfaces");
+ ${"\$"}${targetName}->waitForJob("disnix");
my $pid = ${"\$"}${targetName}->mustSucceed("${socat}/bin/socat
tcp-listen:512,fork exec:/bin/sh & echo -n \$!");
${"\$"}${targetName}->mustSucceed("while [ \"\$(ps -p $pid | grep
socat)\" = \"\" ]; do sleep 0.5; done");
- ${"\$"}${targetName}->waitForJob("disnix");
+
'') (builtins.attrNames infrastructure)}
${"\$"}${builtins.head (builtins.attrNames
infrastructure)}->mustSucceed("${disnix}/bin/disnix-activate --interface
${disnixos}/bin/disnix-backdoor-client --target-property backdoor
--infrastructure ${manifest}/infrastructure.nix --no-coordinator-profile
${manifest}/manifest.xml");
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
