summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-08-22 13:26:54 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-08-27 15:31:48 +0200
commit57ad76074670d4859e808a6aabd69fd6e58514c5 (patch)
treefe92a36f8441e36c3c1a3902a88bad105eea7416 /test
parent482efedc081b0c4bf2e77a3dee6b979d9c9a5765 (diff)
downloadsystemd-57ad76074670d4859e808a6aabd69fd6e58514c5.tar.gz
network: drop all checks of ipv6_disabled sysctl
*We* control the sysctl setting. If the user configured IPv6, then we apply the settings, and just make sure that at some point during the configuration the sysctl is disabled (i.e. ipv6 enabled) if we have IPv6 configured. Replaces #13283.
Diffstat (limited to 'test')
-rwxr-xr-xtest/test-network/systemd-networkd-tests.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py
index 8d123658a1..374d9cdefd 100755
--- a/test/test-network/systemd-networkd-tests.py
+++ b/test/test-network/systemd-networkd-tests.py
@@ -1842,13 +1842,14 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
self.assertRegex(output, 'inet 10.2.3.4/16 brd 10.2.255.255 scope global dummy98')
output = check_output('ip -6 address show dummy98')
print(output)
- self.assertEqual(output, '')
+ self.assertRegex(output, 'inet6 2607:5300:203:3906::/64 scope global')
+ self.assertRegex(output, 'inet6 .* scope link')
output = check_output('ip -4 route show dev dummy98')
print(output)
self.assertEqual(output, '10.2.0.0/16 proto kernel scope link src 10.2.3.4')
output = check_output('ip -6 route show dev dummy98')
print(output)
- self.assertEqual(output, '')
+ self.assertRegex(output, 'default via 2607:5300:203:39ff:ff:ff:ff:ff proto static')
check_output('ip link del dummy98')