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.
This commit is contained in:
Yu Watanabe
2018-11-28 21:40:57 +01:00
parent d486a2d0c1
commit bad4969bba
+7 -1
View File
@@ -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