diff options
author | Marijan Petricevic <marijan.petricevic94@gmail.com> | 2019-11-07 11:08:58 +0100 |
---|---|---|
committer | Marijan Petricevic <marijan.petricevic94@gmail.com> | 2019-11-07 14:06:40 +0100 |
commit | 2c3785a6aebb2ac08bfaa28a9d7abedf1b6a83f8 (patch) | |
tree | c3c0fe72b9114d0813b459e2f3ecd0da151b7962 | |
parent | f04daa6f382803076d83382bc382cc610699c81e (diff) | |
download | nixpkgs-2c3785a6aebb2ac08bfaa28a9d7abedf1b6a83f8.tar nixpkgs-2c3785a6aebb2ac08bfaa28a9d7abedf1b6a83f8.tar.gz nixpkgs-2c3785a6aebb2ac08bfaa28a9d7abedf1b6a83f8.tar.bz2 nixpkgs-2c3785a6aebb2ac08bfaa28a9d7abedf1b6a83f8.tar.lz nixpkgs-2c3785a6aebb2ac08bfaa28a9d7abedf1b6a83f8.tar.xz nixpkgs-2c3785a6aebb2ac08bfaa28a9d7abedf1b6a83f8.tar.zst nixpkgs-2c3785a6aebb2ac08bfaa28a9d7abedf1b6a83f8.zip |
nixos/docker-edge: port test to python
-rw-r--r-- | nixos/tests/docker-edge.nix | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/nixos/tests/docker-edge.nix b/nixos/tests/docker-edge.nix index b306c149be9..96de885a554 100644 --- a/nixos/tests/docker-edge.nix +++ b/nixos/tests/docker-edge.nix @@ -1,6 +1,6 @@ # This test runs docker and checks if simple container starts -import ./make-test.nix ({ pkgs, ...} : { +import ./make-test-python.nix ({ pkgs, ...} : { name = "docker"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ nequissimus offline ]; @@ -31,17 +31,19 @@ import ./make-test.nix ({ pkgs, ...} : { }; testScript = '' - startAll; + start_all() - $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"); - $docker->succeed("sudo -u hasprivs docker ps"); - $docker->fail("sudo -u noprivs docker ps"); - $docker->succeed("docker stop sleeping"); + 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" + ) + docker.succeed("docker ps | grep sleeping") + docker.succeed("sudo -u hasprivs docker ps") + 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-edge.version} | wc -l) = "2" ]'); + docker.succeed('[ $(docker version | grep ${pkgs.docker-edge.version} | wc -l) = "2" ]') ''; }) |