about summary refs log tree commit diff
path: root/nixos/tests/misc.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-04-24 23:15:39 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-04-24 23:18:47 +0200
commit23297b0edde896f76ca1392d45e3c27b1422bafe (patch)
tree35ee1fa2c9b486222986417d40e47cf9cea25b91 /nixos/tests/misc.nix
parentd7a7f80aff92224351ded6e87897ba5286d9f819 (diff)
Make nscd startup synchronous
Nscd forks into the background before it's ready to accept
connections. So explicitly wait until it's ready.

http://hydra.nixos.org/build/10661767
Diffstat (limited to 'nixos/tests/misc.nix')
-rw-r--r--nixos/tests/misc.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix
index 031fff2de5857..24c8b230629c9 100644
--- a/nixos/tests/misc.nix
+++ b/nixos/tests/misc.nix
@@ -13,6 +13,8 @@ import ./make-test.nix {
 
   testScript =
     ''
+      $machine->waitForUnit("default.target");
+
       subtest "nixos-version", sub {
           $machine->succeed("[ `nixos-version | wc -w` = 2 ]");
       };
@@ -61,8 +63,6 @@ import ./make-test.nix {
 
       # Test whether hostname (and by extension nss_myhostname) works.
       subtest "hostname", sub {
-          $machine->waitForUnit("dhcpcd.service");
-          $machine->waitForUnit("network.target");
           $machine->succeed('[ "`hostname`" = machine ]');
           $machine->succeed('[ "`hostname -s`" = machine ]');
       };