From 87b308c825b0a32ecb5bf926c04cd973a597898e Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 22 Jul 2022 10:24:09 +0900 Subject: [PATCH 1/3] test-network: do not stop/restart udevd and related socket units That's not necessary. Moreover, if the socket units are stopped in `setUpModule()`, then there exists a short timespan that we cannot call `udevadm control`, as the control socket may not be opened yet. If we run whole tests, then the first test is NetworkctlTests.test_altname, and it calls `udevadm control` in `setUp()`. Hence, the test may fail. Fixes https://github.com/systemd/systemd-centos-ci/pull/512#issuecomment-1191591008. --- test/test-network/systemd-networkd-tests.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 6a3a2c6f45..6a32bad99f 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -341,8 +341,7 @@ def clear_udev_rules(): rm_rf(udev_rules_dir) def save_active_units(): - for u in ['systemd-udevd-kernel.socket', 'systemd-udevd-control.socket', 'systemd-udevd.service', - 'systemd-networkd.socket', 'systemd-networkd.service', + for u in ['systemd-networkd.socket', 'systemd-networkd.service', 'systemd-resolved.service', 'firewalld.service']: if call(f'systemctl is-active --quiet {u}') == 0: @@ -352,8 +351,6 @@ def save_active_units(): def restore_active_units(): if 'systemd-networkd.socket' in active_units: call('systemctl stop systemd-networkd.socket systemd-networkd.service') - if 'systemd-udevd-kernel.socket' in active_units or 'systemd-udevd-control.socket' in active_units: - call('systemctl stop systemd-udevd-kernel.socket systemd-udevd-control.socket systemd-udevd.service') for u in active_units: call(f'systemctl restart {u}') @@ -730,6 +727,7 @@ def tearDownModule(): rm_rf('/run/systemd/system/systemd-resolved.service.d') rm_rf('/run/systemd/system/systemd-udevd.service.d') check_output('systemctl daemon-reload') + check_output('systemctl restart systemd-udevd.service') restore_active_units() class Utilities(): From 249b7eccf7039bc9a8165e8d7c5fcf5aa4d8d13b Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 22 Jul 2022 10:34:33 +0900 Subject: [PATCH 2/3] test-network: drop unnecessary default argument --- test/test-network/systemd-networkd-tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 6a32bad99f..cb590af3d2 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -597,7 +597,7 @@ def tear_down_common(): flush_links() # 5. stop networkd - stop_networkd(show_logs=True) + stop_networkd() # 6. remove configs clear_network_units() From b1eaae53a2a251e7fdc087f2bc3a7f492bb8639a Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 22 Jul 2022 10:35:58 +0900 Subject: [PATCH 3/3] test-network: drop unnecessary call of systemctl As the units are not started at that stage. --- test/test-network/systemd-networkd-tests.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index cb590af3d2..df8267c62c 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -3129,9 +3129,6 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities): self.assertRegex(output, 'Search Domains: one') def test_keep_configuration_static(self): - check_output('systemctl stop systemd-networkd.socket') - check_output('systemctl stop systemd-networkd.service') - check_output('ip link add name dummy98 type dummy') check_output('ip address add 10.1.2.3/16 dev dummy98') check_output('ip address add 10.2.3.4/16 dev dummy98 valid_lft 600 preferred_lft 500')