mirror of
https://github.com/PX4/PX4-Autopilot.git
synced 2026-05-31 02:16:53 +08:00
mavsdk_tests: use SIGINT before SIGTERM
This commit is contained in:
@@ -6,6 +6,7 @@ import datetime
|
|||||||
import errno
|
import errno
|
||||||
import os
|
import os
|
||||||
import psutil
|
import psutil
|
||||||
|
import signal
|
||||||
import subprocess
|
import subprocess
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
@@ -73,15 +74,24 @@ class Runner:
|
|||||||
if returncode is not None:
|
if returncode is not None:
|
||||||
return returncode
|
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()
|
self.process.terminate()
|
||||||
|
|
||||||
try:
|
try:
|
||||||
return self.process.wait(timeout=3)
|
return self.process.wait(timeout=1)
|
||||||
except subprocess.TimeoutExpired:
|
except subprocess.TimeoutExpired:
|
||||||
print("Sending kill to {}".format(self.process.pid))
|
pass
|
||||||
self.process.kill()
|
|
||||||
return self.process.returncode
|
print("Sending SIGKILL to {}".format(self.process.pid))
|
||||||
|
self.process.kill()
|
||||||
|
return self.process.returncode
|
||||||
|
|
||||||
|
|
||||||
class Px4Runner(Runner):
|
class Px4Runner(Runner):
|
||||||
|
|||||||
Reference in New Issue
Block a user