diff options
author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-07-09 08:10:08 +0900 |
---|---|---|
committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-07-09 11:44:25 +0900 |
commit | 15519a81ace0b48ac23c04ba524c586a52c4cee7 (patch) | |
tree | 31485435f700ed7638816a09c80adfe5c1b514b1 /test/test-network | |
parent | 3857d367f0028dd5480498ba5d3507866c7f294e (diff) | |
download | systemd-15519a81ace0b48ac23c04ba524c586a52c4cee7.tar.gz |
test-network: drop test_dhcp_client_ipv4_ipv6
As the test is covered by test_dhcp_client_reuse_address_as_static.
Diffstat (limited to 'test/test-network')
-rw-r--r-- | test/test-network/conf/25-dhcp-client-ipv4-ipv6.network | 8 | ||||
-rwxr-xr-x | test/test-network/systemd-networkd-tests.py | 41 |
2 files changed, 9 insertions, 40 deletions
diff --git a/test/test-network/conf/25-dhcp-client-ipv4-ipv6.network b/test/test-network/conf/25-dhcp-client-ipv4-ipv6.network deleted file mode 100644 index fe5a7ab058..0000000000 --- a/test/test-network/conf/25-dhcp-client-ipv4-ipv6.network +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth99 - -[Network] -DHCP=ipv4 -# Even if the DHCPv6 client is disabled in config, IPv6AcceptRA=yes -# (which is enabled by default) implies the DHCPv6 client. diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index f0210d558f..37e3dedd5a 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -4484,7 +4484,6 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities): '25-dhcp-client-decline.network', '25-dhcp-client-gateway-ipv6.network', '25-dhcp-client-gateway-onlink-implicit.network', - '25-dhcp-client-ipv4-ipv6.network', '25-dhcp-client-ipv4-only.network', '25-dhcp-client-ipv4-use-routes-use-gateway.network', '25-dhcp-client-ipv6-only.network', @@ -4725,22 +4724,6 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities): # TODO: check json string check_output(*networkctl_cmd, '--json=short', 'status', env=env) - def test_dhcp_client_ipv4_ipv6(self): - copy_unit_to_networkd_unit_path('25-veth.netdev', '25-dhcp-server-veth-peer.network', '25-dhcp-client-ipv4-ipv6.network') - start_networkd() - self.wait_online(['veth-peer:carrier']) - start_dnsmasq() - self.wait_online(['veth99:routable', 'veth-peer:routable']) - - # link become 'routable' when at least one protocol provide an valid address. - self.wait_address('veth99', r'inet 192.168.5.[0-9]*/24 metric 1024 brd 192.168.5.255 scope global dynamic', ipv='-4') - self.wait_address('veth99', r'inet6 2600::[0-9a-f]*/128 scope global (dynamic noprefixroute|noprefixroute dynamic)', ipv='-6') - - output = check_output(*networkctl_cmd, '-n', '0', 'status', 'veth99', env=env) - print(output) - self.assertRegex(output, '2600::') - self.assertRegex(output, '192.168.5') - def test_dhcp_client_settings_anonymize(self): copy_unit_to_networkd_unit_path('25-veth.netdev', '25-dhcp-server-veth-peer.network', '25-dhcp-client-anonymize.network') start_networkd() @@ -4841,13 +4824,9 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities): self.wait_address('veth99', r'inet6 2600::[0-9a-f]*/128 scope global (dynamic noprefixroute|noprefixroute dynamic)', ipv='-6') output = check_output('ip address show dev veth99 scope global') - print(output) - self.assertRegex(output, '192.168.5') - self.assertRegex(output, '2600::') - - ipv4_address = re.search(r'192.168.5.[0-9]*/24', output) - ipv6_address = re.search(r'2600::[0-9a-f:]*/128', output) - static_network = '\n'.join(['[Match]', 'Name=veth99', '[Network]', 'IPv6AcceptRA=no', 'Address=' + ipv4_address.group(), 'Address=' + ipv6_address.group()]) + ipv4_address = re.search(r'192.168.5.[0-9]*/24', output).group() + ipv6_address = re.search(r'2600::[0-9a-f:]*/128', output).group() + static_network = '\n'.join(['[Match]', 'Name=veth99', '[Network]', 'IPv6AcceptRA=no', 'Address=' + ipv4_address, 'Address=' + ipv6_address]) print(static_network) remove_unit_from_networkd_path(['25-dhcp-client.network']) @@ -4855,20 +4834,18 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities): with open(os.path.join(network_unit_file_path, '25-static.network'), mode='w', encoding='utf-8') as f: f.write(static_network) - # When networkd started, the links are already configured, so let's wait for 5 seconds - # the links to be re-configured. - restart_networkd(5) - self.wait_online(['veth99:routable', 'veth-peer:routable']) + restart_networkd() + self.wait_online(['veth99:routable']) output = check_output('ip -4 address show dev veth99 scope global') print(output) - self.assertRegex(output, '192.168.5') - self.assertRegex(output, 'valid_lft forever preferred_lft forever') + self.assertRegex(output, f'inet {ipv4_address} brd 192.168.5.255 scope global veth99\n *' + 'valid_lft forever preferred_lft forever') output = check_output('ip -6 address show dev veth99 scope global') print(output) - self.assertRegex(output, '2600::') - self.assertRegex(output, 'valid_lft forever preferred_lft forever') + self.assertRegex(output, f'inet6 {ipv6_address} scope global *\n *' + 'valid_lft forever preferred_lft forever') @expectedFailureIfModuleIsNotAvailable('vrf') def test_dhcp_client_vrf(self): |