From 07ce825a4ef00110c5f93447268f1779fe133074 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 7 Dec 2014 20:58:48 +0100
Subject: [PATCH] installer tests: don't rely on swap.target until systemd bug
 is fixed

---
 nixos/tests/installer.nix | 7 +++----
 1 file 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");