networkd autopkgtest: More robust/forceful killing of dnsmasq

This commit is contained in:
Martin Pitt 2015-07-26 14:57:38 +02:00
parent 378a828a0a
commit ed80dff0bb
2 changed files with 2 additions and 1 deletions

1
debian/changelog vendored
View File

@ -9,6 +9,7 @@ systemd (222-3) UNRELEASED; urgency=medium
[ Martin Pitt ]
* Enable GNU EFI support and add gnu-efi build dep. This enables/ships the
systemd EFI boot loader. (Closes: #787720)
* networkd autopkgtest: More robust/forceful killing of dnsmasq.
-- Michael Biebl <biebl@debian.org> Tue, 21 Jul 2015 22:24:51 +0200

View File

@ -64,7 +64,7 @@ class TestNetworkd(unittest.TestCase):
subprocess.check_call(['ip', 'link', 'del', 'dev', self.if_router])
self.if_router = None
if self.dnsmasq:
self.dnsmasq.terminate()
self.dnsmasq.kill()
self.dnsmasq.wait()
self.dnsmasq = None