From ece457c62ff81fa80dc366c208d3f4bd4b05f60f Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 19 Mar 2016 02:17:26 +0100 Subject: [PATCH] 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. --- nixos/tests/docker.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/docker.nix b/nixos/tests/docker.nix index 635a97e2ce09..06e511d6e0bd 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");