summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2021-11-17 08:32:45 +0900
committerYu Watanabe <watanabe.yu+github@gmail.com>2021-11-17 08:32:45 +0900
commit3e3b0d2a40e696157eec23314acb6e23618af363 (patch)
tree6749b3ff6581d1d45f6a67855736196ddd27c59d
parentb049b48c4b6e60c3cbec9d2884f90fd4e7013219 (diff)
downloadsystemd-3e3b0d2a40e696157eec23314acb6e23618af363.tar.gz
test-network: make udevd also generate debugging logs
-rw-r--r--test/test-network/conf/00-debug-net.rules2
-rwxr-xr-xtest/test-network/systemd-networkd-tests.py6
2 files changed, 8 insertions, 0 deletions
diff --git a/test/test-network/conf/00-debug-net.rules b/test/test-network/conf/00-debug-net.rules
new file mode 100644
index 0000000000..5146b90c4d
--- /dev/null
+++ b/test/test-network/conf/00-debug-net.rules
@@ -0,0 +1,2 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+SUBSYSTEM=="net", OPTIONS="log_level=debug"
diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py
index 58ca5b5446..68b2e42502 100755
--- a/test/test-network/systemd-networkd-tests.py
+++ b/test/test-network/systemd-networkd-tests.py
@@ -23,6 +23,8 @@ networkd_ci_path='/run/networkd-ci'
network_sysctl_ipv6_path='/proc/sys/net/ipv6/conf'
network_sysctl_ipv4_path='/proc/sys/net/ipv4/conf'
+udev_rules_dir='/run/udev/rules.d'
+
dnsmasq_pid_file='/run/networkd-ci/test-dnsmasq.pid'
dnsmasq_log_file='/run/networkd-ci/test-dnsmasq.log'
dnsmasq_lease_file='/run/networkd-ci/test-dnsmasq.lease'
@@ -273,10 +275,13 @@ def setUpModule():
os.makedirs(network_unit_file_path, exist_ok=True)
os.makedirs(networkd_conf_dropin_path, exist_ok=True)
os.makedirs(networkd_ci_path, exist_ok=True)
+ os.makedirs(udev_rules_dir, exist_ok=True)
shutil.rmtree(networkd_ci_path)
copytree(os.path.join(os.path.dirname(os.path.abspath(__file__)), 'conf'), networkd_ci_path)
+ shutil.copy(os.path.join(networkd_ci_path, '00-debug-net.rules'), udev_rules_dir)
+
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']:
@@ -372,6 +377,7 @@ def tearDownModule():
global running_units
shutil.rmtree(networkd_ci_path)
+ os.remove(os.path.join(udev_rules_dir, '00-debug-net.rules'))
for u in ['systemd-networkd.socket', 'systemd-networkd.service', 'systemd-resolved.service']:
check_output(f'systemctl stop {u}')