Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-21 23:33:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Tools: Exit cleanly based on the environment

Browse Source 
As suggested by Peter Barker
This commit is contained in:
Arash Negahdar 2020-03-09 16:09:28 -04:00 committed by Andrew Tridgell
parent 908b63573e
commit 7de136121b
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Tools/autotest/sim_vehicle.py
View File

@ -21,6 +21,7 @@ import tempfile
import textwrap
import time
import shlex
import binascii
from pymavlink import mavextra
from pysim import vehicleinfo
@ -31,6 +32,8 @@ windowID = []
autotest_dir = os.path.dirname(os.path.realpath(__file__))
root_dir = os.path.realpath(os.path.join(autotest_dir, '../..'))
os.environ["SIM_VEHICLE_SESSION"] = binascii.hexlify(os.urandom(8)).decode()
class CompatError(Exception):
"""A custom exception class to hold state if we encounter the parse
error we are looking for"""
@ -198,11 +201,12 @@ def kill_tasks_psutil(victims):
use this routine"""
import psutil
for proc in psutil.process_iter():
pdict = proc.as_dict(attrs=['name', 'status'])
pdict = proc.as_dict(attrs=['environ', 'status'])
if pdict['status'] == psutil.STATUS_ZOMBIE:
continue
if pdict['name'] in victims:
proc.kill()
if pdict['environ'] is not None:
if pdict['environ'].get('SIM_VEHICLE_SESSION') == os.environ['SIM_VEHICLE_SESSION']:
proc.kill()
def kill_tasks_pkill(victims):