about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2020-06-27 16:01:11 +0200
committerGitHub <noreply@github.com>2020-06-27 16:01:11 +0200
commitd651626eb9ed7a4913ac61147178d498d5867fe9 (patch)
treea1a589e4935d3a4cfa5b48718c02235985f740b4 /nixos
parent7e21bb95c65b89dba3acbe24611af6a57ecebf8b (diff)
parentafc8bd6a7ba6430ba99c78a382e6641a95e6c477 (diff)
Merge pull request #91545 from Frostman/docker-19.03.12
docker: 19.03.11 -> 19.03.12
Diffstat (limited to 'nixos')
-rw-r--r--nixos/tests/docker.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/tests/docker.nix b/nixos/tests/docker.nix
index 8fda7c1395ef3..a4a61468f33dc 100644
--- a/nixos/tests/docker.nix
+++ b/nixos/tests/docker.nix
@@ -43,7 +43,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
     docker.fail("sudo -u noprivs docker ps")
     docker.succeed("docker stop sleeping")
 
-    # Must match version twice to ensure client and server versions are correct
-    docker.succeed('[ $(docker version | grep ${pkgs.docker.version} | wc -l) = "2" ]')
+    # Must match version 4 times to ensure client and server git commits and versions are correct
+    docker.succeed('[ $(docker version | grep ${pkgs.docker.version} | wc -l) = "4" ]')
   '';
 })