diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-07-02 17:14:53 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-07-02 17:14:53 +0200 |
| commit | c33ca7c5ce4d80246fd656dd8a5ab078cc90c03d (patch) | |
| tree | d1a10ef8a3e8fe00ac12ac1437ec46a856521084 /nixos/tests/docker.nix | |
| parent | 798c2d8bc1e947eb26e249b326bfaba49a91b735 (diff) | |
| parent | 3ee58112693c11cd8157495e09714cf9ddb599b3 (diff) | |
| download | nixpkgs-c33ca7c5ce4d80246fd656dd8a5ab078cc90c03d.tar nixpkgs-c33ca7c5ce4d80246fd656dd8a5ab078cc90c03d.tar.gz nixpkgs-c33ca7c5ce4d80246fd656dd8a5ab078cc90c03d.tar.bz2 nixpkgs-c33ca7c5ce4d80246fd656dd8a5ab078cc90c03d.tar.lz nixpkgs-c33ca7c5ce4d80246fd656dd8a5ab078cc90c03d.tar.xz nixpkgs-c33ca7c5ce4d80246fd656dd8a5ab078cc90c03d.tar.zst nixpkgs-c33ca7c5ce4d80246fd656dd8a5ab078cc90c03d.zip | |
Merge staging-next into staging
Diffstat (limited to 'nixos/tests/docker.nix')
| -rw-r--r-- | nixos/tests/docker.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/tests/docker.nix b/nixos/tests/docker.nix index 8fda7c1395e..a4a61468f33 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" ]') ''; }) |