diff options
| author | Robin Gloster <mail@glob.in> | 2017-01-25 16:55:11 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-01-25 17:00:13 +0100 |
| commit | b79fa22b7ab65089bf9a28e15b582b0480d3ee99 (patch) | |
| tree | 3a8355fef66efe903884c7d09b0665bb5b4e4b3e | |
| parent | 0f6eab52e133f2e54723aed7d946efb6f25ca3ea (diff) | |
| download | nixlib-b79fa22b7ab65089bf9a28e15b582b0480d3ee99.tar nixlib-b79fa22b7ab65089bf9a28e15b582b0480d3ee99.tar.gz nixlib-b79fa22b7ab65089bf9a28e15b582b0480d3ee99.tar.bz2 nixlib-b79fa22b7ab65089bf9a28e15b582b0480d3ee99.tar.lz nixlib-b79fa22b7ab65089bf9a28e15b582b0480d3ee99.tar.xz nixlib-b79fa22b7ab65089bf9a28e15b582b0480d3ee99.tar.zst nixlib-b79fa22b7ab65089bf9a28e15b582b0480d3ee99.zip | |
tests.installer: rely on swap.target in tests
fixes #5258
| -rw-r--r-- | nixos/tests/installer.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 1df2c651f9bc..35dd00fe630f 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -115,8 +115,8 @@ let # Did the swap device get activated? # 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"); + $machine->waitForUnit("swap.target"); + $machine->succeed("cat /proc/swaps | grep -q /dev"); # Check whether the channel works. $machine->succeed("nix-env -iA nixos.procps >&2"); |