diff options
| author | zowoq <59103226+zowoq@users.noreply.github.com> | 2023-02-18 20:51:36 +1000 |
|---|---|---|
| committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2023-02-22 10:16:58 +1000 |
| commit | 9ab047538fa0dc1ca1a0e64380553308731bf775 (patch) | |
| tree | 126f7703d7b75452d527171e8ba14c91347c171e /nixos/tests | |
| parent | b53ab7f158e87224636afefa042e1027962f071d (diff) | |
nixos/tests/podman: refactor dns test and fix indentation
Diffstat (limited to 'nixos/tests')
| -rw-r--r-- | nixos/tests/podman/default.nix | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/nixos/tests/podman/default.nix b/nixos/tests/podman/default.nix index 54ead3a8a586b..87e212eb8cd1e 100644 --- a/nixos/tests/podman/default.nix +++ b/nixos/tests/podman/default.nix @@ -133,21 +133,16 @@ import ../make-test-python.nix ( assert pid == "2" with subtest("aardvark-dns"): - dns.succeed("tar cv --files-from /dev/null | podman import - scratchimg") - dns.succeed( - "podman run -d --name=webserver -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin -w ${pkgs.writeTextDir "index.html" "<h1>Hi</h1>"} scratchimg ${pkgs.python3}/bin/python -m http.server 8000" - ) - dns.succeed("podman ps | grep webserver") - dns.succeed(""" - for i in `seq 0 120`; do - podman run --rm --name=client -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg ${pkgs.curl}/bin/curl http://webserver:8000 >/dev/console \ - && exit 0 - sleep 0.5 - done - exit 1 - """) - dns.succeed("podman stop webserver") - dns.succeed("podman rm webserver") + dns.succeed("tar cv --files-from /dev/null | podman import - scratchimg") + dns.succeed( + "podman run -d --name=webserver -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin -w ${pkgs.writeTextDir "index.html" "<h1>Testing</h1>"} scratchimg ${pkgs.python3}/bin/python -m http.server 8000" + ) + dns.succeed("podman ps | grep webserver") + dns.wait_until_succeeds( + "podman run --rm --name=client -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg ${pkgs.curl}/bin/curl http://webserver:8000 | grep Testing" + ) + dns.succeed("podman stop webserver") + dns.succeed("podman rm webserver") with subtest("A podman member can use the docker cli"): docker.succeed(su_cmd("docker version")) |