diff options
| author | Jan Hrnko <jan.hrnko@satoshilabs.com> | 2019-11-06 07:54:45 +0100 |
|---|---|---|
| committer | Jan Hrnko <jan.hrnko@satoshilabs.com> | 2019-11-06 07:54:45 +0100 |
| commit | 38b2e18faa526f2a4cf55f0ed5c18906bfa2627d (patch) | |
| tree | 13baeeb9510c623e1fe6905a9812dfa0825e29eb /nixos/tests/upnp.nix | |
| parent | 13febec4640ba592b1d2068e0bd2c3bfb9084bff (diff) | |
| download | nixpkgs-38b2e18faa526f2a4cf55f0ed5c18906bfa2627d.tar nixpkgs-38b2e18faa526f2a4cf55f0ed5c18906bfa2627d.tar.gz nixpkgs-38b2e18faa526f2a4cf55f0ed5c18906bfa2627d.tar.bz2 nixpkgs-38b2e18faa526f2a4cf55f0ed5c18906bfa2627d.tar.lz nixpkgs-38b2e18faa526f2a4cf55f0ed5c18906bfa2627d.tar.xz nixpkgs-38b2e18faa526f2a4cf55f0ed5c18906bfa2627d.tar.zst nixpkgs-38b2e18faa526f2a4cf55f0ed5c18906bfa2627d.zip | |
nixos/upnp: port test to python
Diffstat (limited to 'nixos/tests/upnp.nix')
| -rw-r--r-- | nixos/tests/upnp.nix | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/nixos/tests/upnp.nix b/nixos/tests/upnp.nix index 98344aee3ef..d2e7fdd4fbe 100644 --- a/nixos/tests/upnp.nix +++ b/nixos/tests/upnp.nix @@ -5,7 +5,7 @@ # this succeeds an external client will try to connect to the port # mapping. -import ./make-test.nix ({ pkgs, ... }: +import ./make-test-python.nix ({ pkgs, ... }: let internalRouterAddress = "192.168.3.1"; @@ -75,20 +75,20 @@ in testScript = { nodes, ... }: '' - startAll; + start_all() # Wait for network and miniupnpd. - $router->waitForUnit("network-online.target"); - # $router->waitForUnit("nat"); - $router->waitForUnit("firewall.service"); - $router->waitForUnit("miniupnpd"); + router.wait_for_unit("network-online.target") + # $router.wait_for_unit("nat") + router.wait_for_unit("firewall.service") + router.wait_for_unit("miniupnpd") - $client1->waitForUnit("network-online.target"); + client1.wait_for_unit("network-online.target") - $client1->succeed("upnpc -a ${internalClient1Address} 9000 9000 TCP"); + client1.succeed("upnpc -a ${internalClient1Address} 9000 9000 TCP") - $client1->waitForUnit("httpd"); - $client2->waitUntilSucceeds("curl http://${externalRouterAddress}:9000/"); + client1.wait_for_unit("httpd") + client2.wait_until_succeeds("curl http://${externalRouterAddress}:9000/") ''; }) |