diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-10-24 12:58:58 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-10-24 12:58:58 +0200 |
| commit | 719aeb36caf764eb969dc2cc6fbee8fd14eb47cc (patch) | |
| tree | e7e861d30442a16428137df415b2688cec00f34d /tests/installer.nix | |
| parent | 2d9258da6705182388fc8e6472a49d2b0fee7b90 (diff) | |
| download | nixpkgs-719aeb36caf764eb969dc2cc6fbee8fd14eb47cc.tar nixpkgs-719aeb36caf764eb969dc2cc6fbee8fd14eb47cc.tar.gz nixpkgs-719aeb36caf764eb969dc2cc6fbee8fd14eb47cc.tar.bz2 nixpkgs-719aeb36caf764eb969dc2cc6fbee8fd14eb47cc.tar.lz nixpkgs-719aeb36caf764eb969dc2cc6fbee8fd14eb47cc.tar.xz nixpkgs-719aeb36caf764eb969dc2cc6fbee8fd14eb47cc.tar.zst nixpkgs-719aeb36caf764eb969dc2cc6fbee8fd14eb47cc.zip | |
Tests: Depend on ‘network.target’
Diffstat (limited to 'tests/installer.nix')
| -rw-r--r-- | tests/installer.nix | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/tests/installer.nix b/tests/installer.nix index 65542ae862e..09c51c1e19e 100644 --- a/tests/installer.nix +++ b/tests/installer.nix @@ -169,13 +169,12 @@ let my $machine = createMachine({ hda => "harddisk", hdaInterface => "${iface}" }); # Did /boot get mounted, if appropriate? - # !!! There is currently no good way to wait for the - # `filesystems' task to finish. - $machine->waitForFile("/boot/grub"); + $machine->waitForUnit("local-fs.target"); + $machine->succeed("test -e /boot/grub"); # Did the swap device get activated? - # !!! Idem. - $machine->waitUntilSucceeds("cat /proc/swaps | grep -q /dev"); + $machine->waitForUnit("swap.target"); + $machine->succeed("cat /proc/swaps | grep -q /dev"); $machine->mustSucceed("nix-env -i coreutils >&2"); $machine->mustSucceed("type -tP ls | tee /dev/stderr") =~ /.nix-profile/ @@ -188,7 +187,7 @@ let # And just to be sure, check that the machine still boots after # "nixos-rebuild switch". my $machine = createMachine({ hda => "harddisk", hdaInterface => "${iface}" }); - $machine->waitForJob("network-interfaces"); + $machine->waitForJob("network.target"); $machine->shutdown; ''; |