diff options
| author | Florian Klink <flokli@flokli.de> | 2019-11-22 20:30:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-22 20:30:39 +0100 |
| commit | ce139ed229670d2a97af7d9501282827f782b938 (patch) | |
| tree | 768b613961e0c8fa3ce0f7a713c0a13edae94b0e | |
| parent | 0b0da4c944e34f2e90896cfe6f594e70bbf4eacd (diff) | |
| parent | 45c1be7cae661e14803c754a80bd89477fbae9a8 (diff) | |
| download | nixpkgs-ce139ed229670d2a97af7d9501282827f782b938.tar nixpkgs-ce139ed229670d2a97af7d9501282827f782b938.tar.gz nixpkgs-ce139ed229670d2a97af7d9501282827f782b938.tar.bz2 nixpkgs-ce139ed229670d2a97af7d9501282827f782b938.tar.lz nixpkgs-ce139ed229670d2a97af7d9501282827f782b938.tar.xz nixpkgs-ce139ed229670d2a97af7d9501282827f782b938.tar.zst nixpkgs-ce139ed229670d2a97af7d9501282827f782b938.zip | |
Merge pull request #73411 from gazally/yggdrasil-python-test
nixosTests.yggdrasil: port to python
| -rw-r--r-- | maintainers/maintainer-list.nix | 1 | ||||
| -rw-r--r-- | nixos/tests/yggdrasil.nix | 40 |
2 files changed, 22 insertions, 19 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index afa610bf43a..ebbda36b1de 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2521,6 +2521,7 @@ gazally = { email = "gazally@runbox.com"; github = "gazally"; + githubId = 16470252; name = "Gemini Lasswell"; }; gebner = { diff --git a/nixos/tests/yggdrasil.nix b/nixos/tests/yggdrasil.nix index 0ef42a0180c..468fcf67127 100644 --- a/nixos/tests/yggdrasil.nix +++ b/nixos/tests/yggdrasil.nix @@ -19,7 +19,7 @@ let SigningPrivateKey = "2a6c21550f3fca0331df50668ffab66b6dce8237bcd5728e571e8033b363e247de111da0ec781e45bf6c63ecb45a78c24d7d4655abfaeea83b26c36eb5c0fd5b"; }; -in import ./make-test.nix ({ pkgs, ...} : { +in import ./make-test-python.nix ({ pkgs, ...} : { name = "yggdrasil"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ gazally ]; @@ -91,33 +91,35 @@ in import ./make-test.nix ({ pkgs, ...} : { testScript = '' + import re + # Give Alice a head start so she is ready when Bob calls. - $alice->start; - $alice->waitForUnit("yggdrasil.service"); + alice.start() + alice.wait_for_unit("yggdrasil.service") - $bob->start; - $carol->start; - $bob->waitForUnit("yggdrasil.service"); - $carol->waitForUnit("yggdrasil.service"); + bob.start() + carol.start() + bob.wait_for_unit("yggdrasil.service") + carol.wait_for_unit("yggdrasil.service") - $carol->waitUntilSucceeds("[ `ip -o -6 addr show dev ygg0 scope global | grep -v tentative | wc -l` -ge 1 ]"); - my $carolIp6 = (split /[ \/]+/, $carol->succeed("ip -o -6 addr show dev ygg0 scope global"))[3]; + ip_addr_show = "ip -o -6 addr show dev ygg0 scope global" + carol.wait_until_succeeds(f"[ `{ip_addr_show} | grep -v tentative | wc -l` -ge 1 ]") + carol_ip6 = re.split(" +|/", carol.succeed(ip_addr_show))[3] # If Alice can talk to Carol, then Bob's outbound peering and Carol's # local peering have succeeded and everybody is connected. - $alice->waitUntilSucceeds("ping -c 1 $carolIp6"); - $alice->succeed("ping -c 1 ${bobIp6}"); - - $bob->succeed("ping -c 1 ${aliceIp6}"); - $bob->succeed("ping -c 1 $carolIp6"); + alice.wait_until_succeeds(f"ping -c 1 {carol_ip6}") + alice.succeed(f"ping -c 1 ${bobIp6}") - $carol->succeed("ping -c 1 ${aliceIp6}"); - $carol->succeed("ping -c 1 ${bobIp6}"); + bob.succeed("ping -c 1 ${aliceIp6}") + bob.succeed(f"ping -c 1 {carol_ip6}") - $carol->fail("journalctl -u dhcpcd | grep ygg0"); + carol.succeed("ping -c 1 ${aliceIp6}") + carol.succeed("ping -c 1 ${bobIp6}") - $alice->waitForUnit("httpd.service"); - $carol->succeed("curl --fail -g http://[${aliceIp6}]"); + carol.fail("journalctl -u dhcpcd | grep ygg0") + alice.wait_for_unit("httpd.service") + carol.succeed("curl --fail -g http://[${aliceIp6}]") ''; }) |