about summary refs log tree commit diff
path: root/nixos/tests/docker.nix
diff options
context:
space:
mode:
authorJoachim Fasting <joachifm@fastmail.fm>2016-03-19 02:17:26 +0100
committerJoachim Fasting <joachifm@fastmail.fm>2016-03-19 03:18:17 +0100
commitece457c62ff81fa80dc366c208d3f4bd4b05f60f (patch)
treec2a8ff2adca05e69f787f267de3c80aed5ae1be4 /nixos/tests/docker.nix
parent7e48d80b7d85bf6aa7e08b99fba6a12d877e8a60 (diff)
nixos/tests: fix docker test
The docker service is socket activated by default; thus,
`waitForUnit("docker.service")` before any docker command causes the
unit test to time out.

Instead, do `waitForUnit("sockets.target")` to ensure that sockets are
setup before running docker commands.
Diffstat (limited to 'nixos/tests/docker.nix')
-rw-r--r--nixos/tests/docker.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/tests/docker.nix b/nixos/tests/docker.nix
index 635a97e2ce090..06e511d6e0bd0 100644
--- a/nixos/tests/docker.nix
+++ b/nixos/tests/docker.nix
@@ -20,7 +20,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   testScript = ''
     startAll;
 
-    $docker->waitForUnit("docker.service");
+    $docker->waitForUnit("sockets.target");
     $docker->succeed("tar cv --files-from /dev/null | docker import - scratchimg");
     $docker->succeed("docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10");
     $docker->succeed("docker ps | grep sleeping");