From: Yu Watanabe Date: Wed, 28 Nov 2018 19:03:56 +0000 (+0100) Subject: test-network: clear state file before starting networkd X-Git-Tag: v240~184^2~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bad4969bbad8303139c486c0a8be854f73e2749a;p=thirdparty%2Fsystemd.git 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. --- diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 37a02292208..52823dc7405 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