From d486a2d0c15422796e825f7fb5ab7f0091494896 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 28 Nov 2018 19:55:01 +0100 Subject: [PATCH 1/3] test-network: use /run instead of legacy /var/run --- test/test-network/systemd-networkd-tests.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 130b20f82f..37a0229220 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -14,14 +14,14 @@ import socket import threading from shutil import copytree -network_unit_file_path='/var/run/systemd/network' -networkd_ci_path='/var/run/networkd-ci' +network_unit_file_path='/run/systemd/network' +networkd_ci_path='/run/networkd-ci' network_sysctl_ipv6_path='/proc/sys/net/ipv6/conf' network_sysctl_ipv4_path='/proc/sys/net/ipv4/conf' -dnsmasq_config_file='/var/run/networkd-ci/test-dnsmasq.conf' -dnsmasq_pid_file='/var/run/networkd-ci/test-test-dnsmasq.pid' -dnsmasq_log_file='/var/run/networkd-ci/test-dnsmasq-log-file' +dnsmasq_config_file='/run/networkd-ci/test-dnsmasq.conf' +dnsmasq_pid_file='/run/networkd-ci/test-test-dnsmasq.pid' +dnsmasq_log_file='/run/networkd-ci/test-dnsmasq-log-file' def is_module_available(module_name): lsmod_output = subprocess.check_output('lsmod', universal_newlines=True) From bad4969bbad8303139c486c0a8be854f73e2749a Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 28 Nov 2018 20:03:56 +0100 Subject: [PATCH 2/3] test-network: clear state file before starting networkd Otherwise, some tests may disturb others, e.g., NetworkdNetWorkTests.test_routing_policy_rule_port_range and NetworkdNetWorkTests.test_routing_policy_rule. --- test/test-network/systemd-networkd-tests.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 37a0229220..52823dc740 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -15,6 +15,7 @@ import threading from shutil import copytree network_unit_file_path='/run/systemd/network' +networkd_runtime_directory='/run/systemd/netif' networkd_ci_path='/run/networkd-ci' network_sysctl_ipv6_path='/proc/sys/net/ipv6/conf' network_sysctl_ipv4_path='/proc/sys/net/ipv4/conf' @@ -118,7 +119,12 @@ class Utilities(): os.remove(dnsmasq_log_file) def start_networkd(self): - subprocess.check_call('systemctl restart systemd-networkd', shell=True) + if (os.path.exists(os.path.join(networkd_runtime_directory, 'state'))): + subprocess.check_call('systemctl stop systemd-networkd', shell=True) + os.remove(os.path.join(networkd_runtime_directory, 'state')) + subprocess.check_call('systemctl start systemd-networkd', shell=True) + else: + subprocess.check_call('systemctl restart systemd-networkd', shell=True) time.sleep(5) global ip From c0bf673376e6286aa71e2fdedfb84aac0b547d37 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 28 Nov 2018 22:00:19 +0100 Subject: [PATCH 3/3] test-network: stop systemd-networkd.socket during testing To suppress noisy warning messages. --- test/test-network/systemd-networkd-tests.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 52823dc740..806f4a496c 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -45,9 +45,15 @@ def setUpModule(): shutil.rmtree(networkd_ci_path) copytree(os.path.join(os.path.dirname(os.path.abspath(__file__)), 'conf'), networkd_ci_path) + subprocess.check_call('systemctl stop systemd-networkd.socket', shell=True) + def tearDownModule(): shutil.rmtree(networkd_ci_path) + subprocess.check_call('systemctl stop systemd-networkd.service', shell=True) + subprocess.check_call('systemctl start systemd-networkd.socket', shell=True) + subprocess.check_call('systemctl start systemd-networkd.service', shell=True) + class Utilities(): dhcp_server_data = []