From 0a3152786bbae2a5d150b31a82cbb41e80e30d98 Mon Sep 17 00:00:00 2001
From: Julian Oes <julian@oes.ch>
Date: Mon, 11 Nov 2019 15:31:41 +0100
Subject: [PATCH] mavsdk_tests: use SIGINT before SIGTERM

---
 test/mavsdk_tests/mavsdk_test_runner.py | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/test/mavsdk_tests/mavsdk_test_runner.py b/test/mavsdk_tests/mavsdk_test_runner.py
index d89eaf819e..491515408f 100755
--- a/test/mavsdk_tests/mavsdk_test_runner.py
+++ b/test/mavsdk_tests/mavsdk_test_runner.py
@@ -6,6 +6,7 @@ import datetime
 import errno
 import os
 import psutil
+import signal
 import subprocess
 import sys
 
@@ -73,15 +74,24 @@ class Runner:
         if returncode is not None:
             return returncode
 
-        print("Sending terminate to {}".format(self.process.pid))
+        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))
         self.process.terminate()
 
         try:
-            return self.process.wait(timeout=3)
+            return self.process.wait(timeout=1)
         except subprocess.TimeoutExpired:
-            print("Sending kill to {}".format(self.process.pid))
-            self.process.kill()
-            return self.process.returncode
+            pass
+
+        print("Sending SIGKILL to {}".format(self.process.pid))
+        self.process.kill()
+        return self.process.returncode
 
 
 class Px4Runner(Runner):