diff options
| author | Florian Klink <flokli@flokli.de> | 2019-11-22 20:25:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-22 20:25:25 +0100 |
| commit | 0b0da4c944e34f2e90896cfe6f594e70bbf4eacd (patch) | |
| tree | ed35bdfdceea56e4e7bc5b119456615734e43bf8 | |
| parent | 8960509fc5308dd4ab500f537c30ada256695d7a (diff) | |
| parent | fe12d5df42d91955bdc424709bb0589c1f53cdcc (diff) | |
| download | nixlib-0b0da4c944e34f2e90896cfe6f594e70bbf4eacd.tar nixlib-0b0da4c944e34f2e90896cfe6f594e70bbf4eacd.tar.gz nixlib-0b0da4c944e34f2e90896cfe6f594e70bbf4eacd.tar.bz2 nixlib-0b0da4c944e34f2e90896cfe6f594e70bbf4eacd.tar.lz nixlib-0b0da4c944e34f2e90896cfe6f594e70bbf4eacd.tar.xz nixlib-0b0da4c944e34f2e90896cfe6f594e70bbf4eacd.tar.zst nixlib-0b0da4c944e34f2e90896cfe6f594e70bbf4eacd.zip | |
Merge pull request #73699 from NinjaTrappeur/wg-test-python
tests/systemd-networkd-wireguard: migrate to python test runner
| -rw-r--r-- | nixos/tests/systemd-networkd-wireguard.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nixos/tests/systemd-networkd-wireguard.nix b/nixos/tests/systemd-networkd-wireguard.nix index aa0ac54e7969..b83e9c7ce190 100644 --- a/nixos/tests/systemd-networkd-wireguard.nix +++ b/nixos/tests/systemd-networkd-wireguard.nix @@ -45,7 +45,7 @@ let generateNodeConf = { lib, pkgs, config, privkpath, pubk, peerId, nodeId, ... }; }; }; -in import ./make-test.nix ({pkgs, ... }: { +in import ./make-test-python.nix ({pkgs, ... }: { name = "networkd-wireguard"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ ninjatrappeur ]; @@ -70,12 +70,12 @@ in import ./make-test.nix ({pkgs, ... }: { in generateNodeConf (attrs // localConf); }; testScript = '' - startAll; - $node1->waitForUnit('systemd-networkd-wait-online.service'); - $node2->waitForUnit('systemd-networkd-wait-online.service'); - $node1->succeed('ping -c 5 10.0.0.2'); - $node2->succeed('ping -c 5 10.0.0.1'); + start_all() + node1.wait_for_unit("systemd-networkd-wait-online.service") + node2.wait_for_unit("systemd-networkd-wait-online.service") + node1.succeed("ping -c 5 10.0.0.2") + node2.succeed("ping -c 5 10.0.0.1") # Is the fwmark set? - $node2->succeed('wg | grep -q 42'); + node2.succeed("wg | grep -q 42") ''; }) |