diff options
| author | Tomasz Czyż <tomasz.czyz@gmail.com> | 2017-04-07 10:28:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 10:28:58 +0100 |
| commit | e57cf5efd110e33fcce675b24d3f06f7739c5940 (patch) | |
| tree | 4e951677c7a0a9bf0a86fb9cbe386c792878d472 /nixos/tests/networking.nix | |
| parent | ab22a0803996c40eee80aa0f81d151090ab15b01 (diff) | |
| parent | 78adf1832f2bec0cb90141202262ca5f7b9a7a30 (diff) | |
| download | nixpkgs-e57cf5efd110e33fcce675b24d3f06f7739c5940.tar nixpkgs-e57cf5efd110e33fcce675b24d3f06f7739c5940.tar.gz nixpkgs-e57cf5efd110e33fcce675b24d3f06f7739c5940.tar.bz2 nixpkgs-e57cf5efd110e33fcce675b24d3f06f7739c5940.tar.lz nixpkgs-e57cf5efd110e33fcce675b24d3f06f7739c5940.tar.xz nixpkgs-e57cf5efd110e33fcce675b24d3f06f7739c5940.tar.zst nixpkgs-e57cf5efd110e33fcce675b24d3f06f7739c5940.zip | |
Merge branch 'master' into postgresql-tests
Diffstat (limited to 'nixos/tests/networking.nix')
| -rw-r--r-- | nixos/tests/networking.nix | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index 83103f35d48..6a7e628d8ef 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -1,4 +1,6 @@ -{ system ? builtins.currentSystem, networkd }: +{ system ? builtins.currentSystem +# bool: whether to use networkd in the tests +, networkd }: with import ../lib/testing.nix { inherit system; }; with pkgs.lib; @@ -166,24 +168,24 @@ let # Test vlan 1 $client->waitUntilSucceeds("ping -c 1 192.168.1.1"); $client->waitUntilSucceeds("ping -c 1 192.168.1.2"); - $client->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:1::1"); - $client->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:1::2"); + $client->waitUntilSucceeds("ping -c 1 fd00:1234:5678:1::1"); + $client->waitUntilSucceeds("ping -c 1 fd00:1234:5678:1::2"); $router->waitUntilSucceeds("ping -c 1 192.168.1.1"); $router->waitUntilSucceeds("ping -c 1 192.168.1.2"); - $router->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:1::1"); - $router->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:1::2"); + $router->waitUntilSucceeds("ping -c 1 fd00:1234:5678:1::1"); + $router->waitUntilSucceeds("ping -c 1 fd00:1234:5678:1::2"); # Test vlan 2 $client->waitUntilSucceeds("ping -c 1 192.168.2.1"); $client->waitUntilSucceeds("ping -c 1 192.168.2.2"); - $client->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:2::1"); - $client->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:2::2"); + $client->waitUntilSucceeds("ping -c 1 fd00:1234:5678:2::1"); + $client->waitUntilSucceeds("ping -c 1 fd00:1234:5678:2::2"); $router->waitUntilSucceeds("ping -c 1 192.168.2.1"); $router->waitUntilSucceeds("ping -c 1 192.168.2.2"); - $router->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:2::1"); - $router->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:2::2"); + $router->waitUntilSucceeds("ping -c 1 fd00:1234:5678:2::1"); + $router->waitUntilSucceeds("ping -c 1 fd00:1234:5678:2::2"); ''; }; dhcpOneIf = { @@ -236,8 +238,8 @@ let firewall.allowPing = true; useDHCP = false; bonds.bond = { - mode = "balance-rr"; interfaces = [ "eth1" "eth2" ]; + driverOptions.mode = "balance-rr"; }; interfaces.eth1.ip4 = mkOverride 0 [ ]; interfaces.eth2.ip4 = mkOverride 0 [ ]; @@ -390,11 +392,11 @@ let $client2->succeed("ip addr >&2"); # Test ipv6 - $client1->waitUntilSucceeds("ping6 -c 1 fc00::1"); - $client1->waitUntilSucceeds("ping6 -c 1 fc00::2"); + $client1->waitUntilSucceeds("ping -c 1 fc00::1"); + $client1->waitUntilSucceeds("ping -c 1 fc00::2"); - $client2->waitUntilSucceeds("ping6 -c 1 fc00::1"); - $client2->waitUntilSucceeds("ping6 -c 1 fc00::2"); + $client2->waitUntilSucceeds("ping -c 1 fc00::1"); + $client2->waitUntilSucceeds("ping -c 1 fc00::2"); ''; }; vlan = let |