diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2019-12-01 01:27:56 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-01 01:27:56 +0000 |
| commit | eabf256408a7cd3f5f0bc41ade9cb18b83855d36 (patch) | |
| tree | 699e033cc55880b67d1ff388430e2c838951d84e | |
| parent | 282ecd233df605f4ae27a639b6c4a8d251ebf020 (diff) | |
| parent | 189a345e223bcc521474a53437e39193024d7c1a (diff) | |
| download | nixpkgs-eabf256408a7cd3f5f0bc41ade9cb18b83855d36.tar nixpkgs-eabf256408a7cd3f5f0bc41ade9cb18b83855d36.tar.gz nixpkgs-eabf256408a7cd3f5f0bc41ade9cb18b83855d36.tar.bz2 nixpkgs-eabf256408a7cd3f5f0bc41ade9cb18b83855d36.tar.lz nixpkgs-eabf256408a7cd3f5f0bc41ade9cb18b83855d36.tar.xz nixpkgs-eabf256408a7cd3f5f0bc41ade9cb18b83855d36.tar.zst nixpkgs-eabf256408a7cd3f5f0bc41ade9cb18b83855d36.zip | |
Merge pull request #74513 from Mic92/ferm
nixos/ferm: port test to python
| -rw-r--r-- | nixos/tests/ferm.nix | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/nixos/tests/ferm.nix b/nixos/tests/ferm.nix index edf9c8036ac..a73c9ce739c 100644 --- a/nixos/tests/ferm.nix +++ b/nixos/tests/ferm.nix @@ -1,5 +1,5 @@ -import ./make-test.nix ({ pkgs, ...} : { +import ./make-test-python.nix ({ pkgs, ...} : { name = "ferm"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ mic92 ]; @@ -53,24 +53,22 @@ import ./make-test.nix ({ pkgs, ...} : { testScript = '' - startAll; + start_all() - $client->waitForUnit("network-online.target"); - $server->waitForUnit("ferm.service"); - $server->waitForUnit("nginx.service"); - $server->waitUntilSucceeds("ss -ntl | grep -q 80"); + client.wait_for_unit("network-online.target") + server.wait_for_unit("ferm.service") + server.wait_for_unit("nginx.service") + server.wait_until_succeeds("ss -ntl | grep -q 80") - subtest "port 80 is allowed", sub { - $client->succeed("curl --fail -g http://192.168.1.1:80/status"); - $client->succeed("curl --fail -g http://[fd00::1]:80/status"); - }; + with subtest("port 80 is allowed"): + client.succeed("curl --fail -g http://192.168.1.1:80/status") + client.succeed("curl --fail -g http://[fd00::1]:80/status") - subtest "port 8080 is not allowed", sub { - $server->succeed("curl --fail -g http://192.168.1.1:8080/status"); - $server->succeed("curl --fail -g http://[fd00::1]:8080/status"); + with subtest("port 8080 is not allowed"): + server.succeed("curl --fail -g http://192.168.1.1:8080/status") + server.succeed("curl --fail -g http://[fd00::1]:8080/status") - $client->fail("curl --fail -g http://192.168.1.1:8080/status"); - $client->fail("curl --fail -g http://[fd00::1]:8080/status"); - }; + client.fail("curl --fail -g http://192.168.1.1:8080/status") + client.fail("curl --fail -g http://[fd00::1]:8080/status") ''; }) |