Browse Source

Test runner: Terminate all px4 apps correctly

Without this change an aborted run leaves zombie processes running.
sbg
Lorenz Meier 5 years ago
parent
commit
de8fadf1f5
  1. 8
      test/mavsdk_tests/mavsdk_test_runner.py

8
test/mavsdk_tests/mavsdk_test_runner.py

@ -8,6 +8,7 @@ import os @@ -8,6 +8,7 @@ import os
import psutil
import subprocess
import sys
import signal
test_matrix = [
@ -79,6 +80,13 @@ class Runner: @@ -79,6 +80,13 @@ 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("Terminating {}".format(self.process.pid))
self.process.terminate()

Loading…
Cancel
Save