diff options
| author | Mark Vainomaa <mikroskeem@mikroskeem.eu> | 2021-01-15 15:53:43 +0200 |
|---|---|---|
| committer | Mark Vainomaa <mikroskeem@mikroskeem.eu> | 2021-01-15 15:53:43 +0200 |
| commit | f53cf9a65c83c400aec421cb2eb105acc75431f6 (patch) | |
| tree | 178d027630fd63b7fa228e734f488ff0be85f827 /nixos/tests | |
| parent | a81c27cd54f4badd24924e82f0d7da7285137534 (diff) | |
Revert "nixos/tests/docker: wait for docker service"
This reverts commit c14bafd6c7db3b0c03574e28831821adda22a6f1.
Diffstat (limited to 'nixos/tests')
| -rw-r--r-- | nixos/tests/docker-tools.nix | 2 | ||||
| -rw-r--r-- | nixos/tests/docker.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix index e2bd9ddf6470..6638ec4927ce 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -18,7 +18,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { testScript = with pkgs.dockerTools; '' unix_time_second1 = "1970-01-01T00:00:01Z" - docker.wait_for_unit("docker.service") + docker.wait_for_unit("sockets.target") with subtest("Ensure Docker images use a stable date by default"): docker.succeed( diff --git a/nixos/tests/docker.nix b/nixos/tests/docker.nix index a0f328af775c..58e33535ed31 100644 --- a/nixos/tests/docker.nix +++ b/nixos/tests/docker.nix @@ -33,7 +33,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { testScript = '' start_all() - docker.wait_for_unit("docker.service") + docker.wait_for_unit("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" |