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

autotest: fix --map option

Browse Source
This commit is contained in:
Peter Barker 2021-03-31 13:20:08 +11:00 committed by Peter Barker
parent d621fe0cde
commit ba972b6b46
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Tools/autotest/common.py
View File

@ -2201,14 +2201,10 @@ class AutoTest(ABC):
def close(self): def close(self):
"""Tidy up after running all tests.""" """Tidy up after running all tests."""
if self.use_map:
self.mavproxy.send("module unload map\n")
self.mavproxy.expect("Unloaded module map")
if self.mav is not None: if self.mav is not None:
self.mav.close() self.mav.close()
self.mav = None self.mav = None
util.pexpect_close(self.mavproxy)
self.stop_SITL() self.stop_SITL()
valgrind_log = util.valgrind_log_filepath(binary=self.binary, valgrind_log = util.valgrind_log_filepath(binary=self.binary,
@ -5705,6 +5701,10 @@ Also, ignores heartbeats not from our target system'''
if self._mavproxy is not None: if self._mavproxy is not None:
self.progress("Stopping auto-started mavproxy") self.progress("Stopping auto-started mavproxy")
if self.use_map:
self.mavproxy.send("module unload map\n")
self.mavproxy.expect("Unloaded module map")
self.expect_list_remove(self._mavproxy) self.expect_list_remove(self._mavproxy)
util.pexpect_close(self._mavproxy) util.pexpect_close(self._mavproxy)
self._mavproxy = None self._mavproxy = None
@ -5846,7 +5846,6 @@ Also, ignores heartbeats not from our target system'''
return self.sitl.isalive() return self.sitl.isalive()
def autostart_mavproxy(self): def autostart_mavproxy(self):
return False
return self.use_map return self.use_map
def init(self): def init(self):