From f021702d212c6f78225fd2ed3a08d7ce669731f1 Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Sun, 26 Aug 2018 14:15:15 +0200 Subject: [PATCH 1/2] nixos/tests/networking: fix routes tests The output format of `ip route` changed, it now explicitly shows "proto static" for static routes. --- nixos/tests/networking.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index cd5d537a3be7..76ece1ea3e6f 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -552,15 +552,15 @@ let testScript = '' my $targetIPv4Table = <<'END'; - 10.0.0.0/16 scope link mtu 1500 + 10.0.0.0/16 proto static scope link mtu 1500 192.168.1.0/24 proto kernel scope link src 192.168.1.2 - 192.168.2.0/24 via 192.168.1.1 + 192.168.2.0/24 via 192.168.1.1 proto static END my $targetIPv6Table = <<'END'; 2001:1470:fffd:2097::/64 proto kernel metric 256 pref medium - 2001:1470:fffd:2098::/64 via fdfd:b3f0::1 metric 1024 pref medium - fdfd:b3f0::/48 metric 1024 pref medium + 2001:1470:fffd:2098::/64 via fdfd:b3f0::1 proto static metric 1024 pref medium + fdfd:b3f0::/48 proto static metric 1024 pref medium END $machine->start; From 3f8756ce10d7a3d2cc61b7b2f44e0890a2561e40 Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Sun, 26 Aug 2018 14:24:07 +0200 Subject: [PATCH 2/2] nixos/tests/networking: fix "virtual" tests `ip route` now displays extended tun attributes, so the expected output of this test changed. Upstream change: https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=118eda77d6602616bc523a17ee45171e879d1818 --- nixos/tests/networking.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index 76ece1ea3e6f..ff088ad2621b 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -448,8 +448,8 @@ let testScript = '' my $targetList = <<'END'; - tap0: tap UNKNOWN_FLAGS:800 user 0 - tun0: tun UNKNOWN_FLAGS:800 user 0 + tap0: tap persist user 0 + tun0: tun persist user 0 END # Wait for networking to come up