diff options
| author | Domen Kožar <domen@dev.si> | 2014-12-07 20:58:48 +0100 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2014-12-07 20:58:48 +0100 |
| commit | 07ce825a4ef00110c5f93447268f1779fe133074 (patch) | |
| tree | 5e5369b8329d44f3a5249f6062babcc874e06631 /nixos/tests/installer.nix | |
| parent | 90c7b16fcff27df172f305b57772be6131b56444 (diff) | |
| download | nixpkgs-07ce825a4ef00110c5f93447268f1779fe133074.tar nixpkgs-07ce825a4ef00110c5f93447268f1779fe133074.tar.gz nixpkgs-07ce825a4ef00110c5f93447268f1779fe133074.tar.bz2 nixpkgs-07ce825a4ef00110c5f93447268f1779fe133074.tar.lz nixpkgs-07ce825a4ef00110c5f93447268f1779fe133074.tar.xz nixpkgs-07ce825a4ef00110c5f93447268f1779fe133074.tar.zst nixpkgs-07ce825a4ef00110c5f93447268f1779fe133074.zip | |
installer tests: don't rely on swap.target until systemd bug is fixed
Diffstat (limited to 'nixos/tests/installer.nix')
| -rw-r--r-- | nixos/tests/installer.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index e09572de489..4f55f7242bf 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -58,8 +58,6 @@ let ${optionalString (!readOnly) "nix.readOnlyStore = false;"} - swapDevices = lib.mkOverride 0 [ ]; - environment.systemPackages = [ ${optionalString testChannel "pkgs.rlwrap"} ]; } ''; @@ -187,8 +185,9 @@ let $machine->succeed("test -e /boot/grub"); # Did the swap device get activated? - $machine->waitForUnit("swap.target"); - $machine->succeed("cat /proc/swaps | grep -q /dev"); + # uncomment once https://bugs.freedesktop.org/show_bug.cgi?id=86930 is resolved + #$machine->waitForUnit("swap.target"); + $machine->waitUntilSucceeds("cat /proc/swaps | grep -q /dev"); # Check whether the channel works. $machine->succeed("nix-env -i coreutils >&2"); |