From 698731e4f5723b53a7636d03ffe65df5b7e891a5 Mon Sep 17 00:00:00 2001 From: Julian Oes Date: Wed, 13 Nov 2019 18:49:57 +0100 Subject: [PATCH] mavsdk_tests: don't use SIGINT, just terminate --- test/mavsdk_tests/mavsdk_test_runner.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/test/mavsdk_tests/mavsdk_test_runner.py b/test/mavsdk_tests/mavsdk_test_runner.py index c3f5d30760..dafcaeefce 100755 --- a/test/mavsdk_tests/mavsdk_test_runner.py +++ b/test/mavsdk_tests/mavsdk_test_runner.py @@ -6,7 +6,6 @@ import datetime import errno import os import psutil -import signal import subprocess @@ -73,14 +72,7 @@ class Runner: if returncode is not None: return returncode - print("Sending SIGINT to {}".format(self.process.pid)) - self.process.send_signal(signal.SIGINT) - try: - return self.process.wait(timeout=1) - except subprocess.TimeoutExpired: - pass - - print("Sending SIGTERM to {}".format(self.process.pid)) + print("Terminating {}".format(self.process.pid)) self.process.terminate() try: @@ -88,7 +80,7 @@ class Runner: except subprocess.TimeoutExpired: pass - print("Sending SIGKILL to {}".format(self.process.pid)) + print("Killing {}".format(self.process.pid)) self.process.kill() return self.process.returncode