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

installer tests: don't rely on swap.target until systemd bug is fixed

Browse Source
This commit is contained in:
Domen Kožar 2014-12-07 20:58:48 +01:00
parent 90c7b16fcf
commit 07ce825a4e
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nixos/tests/installer.nix
View File

@ -58,8 +58,6 @@ let
${optionalString (!readOnly) "nix.readOnlyStore = false;"} ${optionalString (!readOnly) "nix.readOnlyStore = false;"}
swapDevices = lib.mkOverride 0 [ ];
environment.systemPackages = [ ${optionalString testChannel "pkgs.rlwrap"} ]; environment.systemPackages = [ ${optionalString testChannel "pkgs.rlwrap"} ];
} }
''; '';
@ -187,8 +185,9 @@ let
$machine->succeed("test -e /boot/grub"); $machine->succeed("test -e /boot/grub");
# Did the swap device get activated? # Did the swap device get activated?
$machine->waitForUnit("swap.target"); # uncomment once https://bugs.freedesktop.org/show_bug.cgi?id=86930 is resolved
$machine->succeed("cat /proc/swaps | grep -q /dev"); #$machine->waitForUnit("swap.target");
$machine->waitUntilSucceeds("cat /proc/swaps | grep -q /dev");
# Check whether the channel works. # Check whether the channel works.
$machine->succeed("nix-env -i coreutils >&2"); $machine->succeed("nix-env -i coreutils >&2");