From ec6a47044a2ab321ae6427ce0d9fa3f6a17544a8 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 3 Oct 2018 14:16:24 +0900 Subject: [PATCH 1/2] test: replace stop+start by restart This suppress the following warnings: ``` Warning: Stopping systemd-networkd.service, but it can still be activated by: systemd-networkd.socket ``` --- test/test-network/systemd-networkd-tests.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 760310a33f..043fdac778 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -99,9 +99,7 @@ class Utilities(): os.remove(dnsmasq_log_file) def start_networkd(self): - subprocess.check_call('systemctl stop systemd-networkd', shell=True) - time.sleep(1) - subprocess.check_call('systemctl start systemd-networkd', shell=True) + subprocess.check_call('systemctl restart systemd-networkd', shell=True) time.sleep(5) global ip From 6aea927681bea61a8b7abfa87217f485316058da Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 3 Oct 2018 14:38:30 +0900 Subject: [PATCH 2/2] test: make systemd-networkd-tests.py run on arbitrary directory --- test/test-network/systemd-networkd-tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 043fdac778..fc347c6008 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -28,7 +28,7 @@ def setUpModule(): os.makedirs(networkd_ci_path, exist_ok=True) shutil.rmtree(networkd_ci_path) - copytree('conf', networkd_ci_path) + copytree(os.path.join(os.path.dirname(os.path.abspath(__file__)), 'conf'), networkd_ci_path) def tearDownModule(): shutil.rmtree(networkd_ci_path)