diff options
| author | Jörg Thalheim <joerg@higgsboson.tk> | 2017-02-15 11:05:50 +0100 |
|---|---|---|
| committer | Jörg Thalheim <joerg@higgsboson.tk> | 2017-02-17 16:04:49 +0100 |
| commit | fd78ff23f7dd0db1a468189672aeb85f53d4ec99 (patch) | |
| tree | 9902acafd3e56d206e03c769374ab235b922038b /nixos/tests/networking.nix | |
| parent | a674dea6756b773e1e41f9df2aaa29e9499f74f9 (diff) | |
| download | nixlib-fd78ff23f7dd0db1a468189672aeb85f53d4ec99.tar nixlib-fd78ff23f7dd0db1a468189672aeb85f53d4ec99.tar.gz nixlib-fd78ff23f7dd0db1a468189672aeb85f53d4ec99.tar.bz2 nixlib-fd78ff23f7dd0db1a468189672aeb85f53d4ec99.tar.lz nixlib-fd78ff23f7dd0db1a468189672aeb85f53d4ec99.tar.xz nixlib-fd78ff23f7dd0db1a468189672aeb85f53d4ec99.tar.zst nixlib-fd78ff23f7dd0db1a468189672aeb85f53d4ec99.zip | |
replace ping6 with ping
reason: after the upgrade of iputils from 20151218 to 20161105 functionality of ping6 and tracepath6 was merged into ping and tracepath. Ping is now mostly a drop-in replacment for ping6, except that selecting a specific interface is done by encoding it into the address (ex.: fe80::1%eth0) rather then specifing it with the `-I` flag.
Diffstat (limited to 'nixos/tests/networking.nix')
| -rw-r--r-- | nixos/tests/networking.nix | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index 83103f35d482..541f03324ab5 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -166,24 +166,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 = { @@ -390,11 +390,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 |