diff options
| author | Jacek Galowicz <jacek.galowicz@cyberus-technology.de> | 2019-12-06 07:45:49 +0100 |
|---|---|---|
| committer | Jacek Galowicz <jacek.galowicz@cyberus-technology.de> | 2019-12-06 08:21:33 +0100 |
| commit | 4a7ba2cdfe69e18bee4753e2582bb924116c6029 (patch) | |
| tree | a90f834a31ad2bf0887fc8deff9bf13021eb4ff6 | |
| parent | 86a9d80b45a1b9aed0c1b0f94fdbec614703ff4a (diff) | |
| download | nixpkgs-4a7ba2cdfe69e18bee4753e2582bb924116c6029.tar nixpkgs-4a7ba2cdfe69e18bee4753e2582bb924116c6029.tar.gz nixpkgs-4a7ba2cdfe69e18bee4753e2582bb924116c6029.tar.bz2 nixpkgs-4a7ba2cdfe69e18bee4753e2582bb924116c6029.tar.lz nixpkgs-4a7ba2cdfe69e18bee4753e2582bb924116c6029.tar.xz nixpkgs-4a7ba2cdfe69e18bee4753e2582bb924116c6029.tar.zst nixpkgs-4a7ba2cdfe69e18bee4753e2582bb924116c6029.zip | |
nixosTests.docker-tools-overlay: Port to Python
| -rw-r--r-- | nixos/tests/docker-tools-overlay.nix | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/nixos/tests/docker-tools-overlay.nix b/nixos/tests/docker-tools-overlay.nix index 637957bd3e8..1a0e0ea6775 100644 --- a/nixos/tests/docker-tools-overlay.nix +++ b/nixos/tests/docker-tools-overlay.nix @@ -1,6 +1,6 @@ # this test creates a simple GNU image with docker tools and sees if it executes -import ./make-test.nix ({ pkgs, ... }: +import ./make-test-python.nix ({ pkgs, ... }: { name = "docker-tools-overlay"; meta = with pkgs.stdenv.lib.maintainers; { @@ -16,17 +16,18 @@ import ./make-test.nix ({ pkgs, ... }: }; }; - testScript = - '' - $docker->waitForUnit("sockets.target"); + testScript = '' + docker.wait_for_unit("sockets.target") - $docker->succeed("docker load --input='${pkgs.dockerTools.examples.bash}'"); - $docker->succeed("docker run --rm ${pkgs.dockerTools.examples.bash.imageName} bash --version"); + docker.succeed( + "docker load --input='${pkgs.dockerTools.examples.bash}'", + "docker run --rm ${pkgs.dockerTools.examples.bash.imageName} bash --version", + ) # Check if the nix store has correct user permissions depending on what # storage driver is used, incorrectly built images can show up as readonly. # drw------- 3 0 0 3 Apr 14 11:36 /nix # drw------- 99 0 0 100 Apr 14 11:36 /nix/store - $docker->succeed("docker run --rm -u 1000:1000 ${pkgs.dockerTools.examples.bash.imageName} bash --version"); + docker.succeed("docker run --rm -u 1000:1000 ${pkgs.dockerTools.examples.bash.imageName} bash --version") ''; }) |