From 9f10126f3c10797335363e4c8de7e4be700a7ec0 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 24 May 2019 13:38:08 +0900 Subject: [PATCH] test-network: stop dnsmasq before removing links --- test/test-network/systemd-networkd-tests.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 0d6e5284f9..d809e72abc 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -1906,15 +1906,15 @@ class NetworkdNetworkDHCPClientTests(unittest.TestCase, Utilities): 'static.network'] def setUp(self): - self.link_remove(self.links) self.stop_dnsmasq(dnsmasq_pid_file) + self.link_remove(self.links) def tearDown(self): - self.link_remove(self.links) - self.remove_unit_from_networkd_path(self.units) self.stop_dnsmasq(dnsmasq_pid_file) self.remove_lease_file() self.remove_log_file() + self.link_remove(self.links) + self.remove_unit_from_networkd_path(self.units) def test_dhcp_client_ipv6_only(self): self.copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-server-veth-peer.network', 'dhcp-client-ipv6-only.network') -- 2.25.1