From: Yu Watanabe Date: Fri, 8 Jul 2022 22:15:37 +0000 (+0900) Subject: test-network: drop 25-dhcp-v4-server-veth-peer.network X-Git-Tag: v252-rc1~690^2~11 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e81083f2d85e2fc10875267b62a42382dc8f4250;p=thirdparty%2Fsystemd.git test-network: drop 25-dhcp-v4-server-veth-peer.network --- diff --git a/test/test-network/conf/25-dhcp-v4-server-veth-peer.network b/test/test-network/conf/25-dhcp-v4-server-veth-peer.network deleted file mode 100644 index 7e1f56018a3..00000000000 --- a/test/test-network/conf/25-dhcp-v4-server-veth-peer.network +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth-peer - -[Network] -IPv6AcceptRA=no -Address=192.168.0.1/24 -Address=192.168.5.1/24 diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index b67ad702fc7..e028d087133 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -4499,7 +4499,6 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities): '25-dhcp-client.network', '25-dhcp-server-decline.network', '25-dhcp-server-veth-peer.network', - '25-dhcp-v4-server-veth-peer.network', '25-static.network'] def setUp(self): @@ -4757,7 +4756,9 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities): self.assertNotIn('26:mtu', output) def test_dhcp_keep_configuration_dhcp(self): - copy_unit_to_networkd_unit_path('25-veth.netdev', '25-dhcp-v4-server-veth-peer.network', '25-dhcp-client-keep-configuration-dhcp.network') + copy_unit_to_networkd_unit_path('25-veth.netdev', + '25-dhcp-server-veth-peer.network', + '25-dhcp-client-keep-configuration-dhcp.network') start_networkd() self.wait_online(['veth-peer:carrier']) start_dnsmasq(lease_time='2m') @@ -4811,7 +4812,9 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities): self.assertRegex(output, r'192.168.5.*') def test_dhcp_keep_configuration_dhcp_on_stop(self): - copy_unit_to_networkd_unit_path('25-veth.netdev', '25-dhcp-v4-server-veth-peer.network', '25-dhcp-client-keep-configuration-dhcp-on-stop.network') + copy_unit_to_networkd_unit_path('25-veth.netdev', + '25-dhcp-server-veth-peer.network', + '25-dhcp-client-keep-configuration-dhcp-on-stop.network') start_networkd() self.wait_online(['veth-peer:carrier']) start_dnsmasq(lease_time='2m')