summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2020-02-10 00:43:58 +0900
committerYu Watanabe <watanabe.yu+github@gmail.com>2020-02-10 00:51:00 +0900
commitf7ada4b8ec12d09748f95de6c9753e1a0657d51c (patch)
tree7aa5c9efdd312ea6e107955089182ebdb12adfde
parentb241fa00e92ea086a9d99840f9f5cbb98485680e (diff)
downloadsystemd-f7ada4b8ec12d09748f95de6c9753e1a0657d51c.tar.gz
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
-rwxr-xr-xtest/test-network/systemd-networkd-tests.py7
1 files 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}')