From e93faa289b515986704842b6b66c8a93c21ac707 Mon Sep 17 00:00:00 2001 From: Martine Lenders Date: Wed, 8 Oct 2014 11:12:59 +0200 Subject: [PATCH] netdev.tests: Kill processes properly --- tests/netdev/tests/01-interaction.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/netdev/tests/01-interaction.py b/tests/netdev/tests/01-interaction.py index 0a683b3020..188011f445 100755 --- a/tests/netdev/tests/01-interaction.py +++ b/tests/netdev/tests/01-interaction.py @@ -6,7 +6,7 @@ # General Public License v2.1. See the file LICENSE in the top level # directory for more details. -import os, sys, time +import os, signal, sys, time from pexpect import spawn, TIMEOUT, EOF class Abort(Exception): @@ -134,9 +134,9 @@ def main(): return 0 finally: if sender and not sender.terminate(): - sender.terminate(force=True) + os.killpg(sender.pid, signal.SIGKILL) if receiver and not receiver.terminate(): - receiver.terminate(force=True) + os.killpg(receiver.pid, signal.SIGKILL) if __name__ == "__main__": sys.exit(main())