From: Yu Watanabe Date: Wed, 20 Dec 2023 19:08:02 +0000 (+0900) Subject: test-network: use the main .network file X-Git-Tag: v256-rc1~1424^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67150a7bd4687261c043a2cb4491ef23cd0e5ecb;p=thirdparty%2Fsystemd.git test-network: use the main .network file These tests are not interested in most addresses specified in the .network file. As 10-many-address.conf drop-in config for the .network file contains so many addresses, hopefully this improves test performance. --- diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index adb60cd4893..a3f3c6085cb 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -1087,7 +1087,7 @@ class NetworkctlTests(unittest.TestCase, Utilities): self.assertNotIn('dummy98', output) def test_reconfigure(self): - copy_network_unit('25-address-static.network', '12-dummy.netdev') + copy_network_unit('25-address-static.network', '12-dummy.netdev', copy_dropins=False) start_networkd() self.wait_online(['dummy98:routable']) @@ -1121,7 +1121,7 @@ class NetworkctlTests(unittest.TestCase, Utilities): self.assertNotIn('inet 10.1.2.4/16 brd 10.1.255.255 scope global secondary dummy98', output) self.assertNotIn('inet 10.2.2.4/16 brd 10.2.255.255 scope global dummy98', output) - copy_network_unit('25-address-static.network') + copy_network_unit('25-address-static.network', copy_dropins=False) networkctl_reload() self.wait_online(['dummy98:routable']) @@ -1154,7 +1154,7 @@ class NetworkctlTests(unittest.TestCase, Utilities): check() def test_up_down(self): - copy_network_unit('25-address-static.network', '12-dummy.netdev') + copy_network_unit('25-address-static.network', '12-dummy.netdev', copy_dropins=False) start_networkd() self.wait_online(['dummy98:routable']) @@ -3186,7 +3186,7 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities): output = check_output(*networkctl_cmd, '--json=short', 'status', env=env) check_json(output) - copy_network_unit('25-address-static.network') + copy_network_unit('25-address-static.network', copy_dropins=False) networkctl_reload() self.wait_online(['dummy98:routable'])