From f7ada4b8ec12d09748f95de6c9753e1a0657d51c Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 10 Feb 2020 00:43:58 +0900 Subject: [PATCH] test-network: tentatively stops .socket units for udevd To suppress the following warning: --- Warning: Stopping systemd-udevd.service, but it can still be activated by: systemd-udevd-control.socket systemd-udevd-kernel.socket --- test/test-network/systemd-networkd-tests.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 0210c7bfae..c1a84ca9ec 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -165,7 +165,9 @@ def setUpModule(): shutil.rmtree(networkd_ci_path) copytree(os.path.join(os.path.dirname(os.path.abspath(__file__)), 'conf'), networkd_ci_path) - for u in ['systemd-networkd.socket', 'systemd-networkd.service', 'systemd-resolved.service', 'systemd-udevd.service', 'firewalld.service']: + for u in ['systemd-networkd.socket', 'systemd-networkd.service', 'systemd-resolved.service', + 'systemd-udevd-kernel.socket', 'systemd-udevd-control.socket', 'systemd-udevd.service', + 'firewalld.service']: if call(f'systemctl is-active --quiet {u}') == 0: check_output(f'systemctl stop {u}') running_units.append(u) @@ -249,13 +251,14 @@ def tearDownModule(): shutil.rmtree(networkd_ci_path) - for u in ['systemd-networkd.service', 'systemd-resolved.service', 'systemd-udevd.service']: + for u in ['systemd-networkd.service', 'systemd-resolved.service']: check_output(f'systemctl stop {u}') shutil.rmtree('/run/systemd/system/systemd-networkd.service.d') shutil.rmtree('/run/systemd/system/systemd-resolved.service.d') shutil.rmtree('/run/systemd/system/systemd-udevd.service.d') check_output('systemctl daemon-reload') + check_output('systemctl restart systemd-udevd.service') for u in running_units: check_output(f'systemctl start {u}')