aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

autotest: disable mavutil autoreconnect in drain_mav

Browse Source 
The process may not be available
This commit is contained in:
Peter Barker 2022-07-18 14:58:40 +10:00 committed by Peter Barker
parent acd9fb9c0a
commit 271b4d7d3c
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Tools/autotest/common.py
View File

@ -2749,7 +2749,17 @@ class AutoTest(ABC):
timeout = 120 timeout = 120
failed_to_drain = False failed_to_drain = False
self.pause_SITL() self.pause_SITL()
while mav.recv_msg() is not None: # sometimes we recv() when the process is likely to go away..
old_autoreconnect = mav.autoreconnect
mav.autoreconnect = False
while True:
try:
receive_result = mav.recv_msg()
except Exception:
mav.autoreconnect = True
raise
if receive_result is None:
break
count += 1 count += 1
if time.time() - tstart > timeout: if time.time() - tstart > timeout:
# ArduPilot can produce messages faster than we can # ArduPilot can produce messages faster than we can
@ -2757,6 +2767,7 @@ class AutoTest(ABC):
# just die if that seems to be the case: # just die if that seems to be the case:
failed_to_drain = True failed_to_drain = True
quiet = False quiet = False
mav.autoreconnect = old_autoreconnect
self.unpause_SITL() self.unpause_SITL()
if quiet: if quiet:
self.in_drain_mav = False self.in_drain_mav = False