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

autotest: add option to hard-reset after every test

Browse Source
This commit is contained in:
Peter Barker 2021-08-03 08:55:56 +10:00 committed by Peter Barker
parent 013bee99f4
commit 5e81026e78
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Tools/autotest/autotest.py
View File

@ -513,6 +513,7 @@ def run_step(step):
"replay": opts.replay, "replay": opts.replay,
"logs_dir": buildlogs_dirpath(), "logs_dir": buildlogs_dirpath(),
"sup_binaries": supplementary_binaries, "sup_binaries": supplementary_binaries,
"reset_after_every_test": opts.reset_after_every_test,
} }
if opts.speedup is not None: if opts.speedup is not None:
fly_opts["speedup"] = opts.speedup fly_opts["speedup"] = opts.speedup
@ -994,6 +995,10 @@ if __name__ == "__main__":
type='string', type='string',
default="", default="",
help='list available subtests for a vehicle e.g Copter') help='list available subtests for a vehicle e.g Copter')
group_completion.add_option("--reset-after-every-test",
action='store_true',
default=False,
help='reset everything after every test run')
parser.add_option_group(group_completion) parser.add_option_group(group_completion)
opts, args = parser.parse_args() opts, args = parser.parse_args()

7
Tools/autotest/common.py
View File

@ -1218,7 +1218,8 @@ class AutoTest(ABC):
logs_dir=None, logs_dir=None,
force_ahrs_type=None, force_ahrs_type=None,
replay=False, replay=False,
sup_binaries=[]): sup_binaries=[],
reset_after_every_test=False):
self.start_time = time.time() self.start_time = time.time()
global __autotest__ # FIXME; make progress a non-staticmethod global __autotest__ # FIXME; make progress a non-staticmethod
@ -1241,6 +1242,7 @@ class AutoTest(ABC):
if self.speedup is None: if self.speedup is None:
self.speedup = self.default_speedup() self.speedup = self.default_speedup()
self.sup_binaries = sup_binaries self.sup_binaries = sup_binaries
self.reset_after_every_test = reset_after_every_test
self.mavproxy = None self.mavproxy = None
self._mavproxy = None # for auto-cleanup on failed tests self._mavproxy = None # for auto-cleanup on failed tests
@ -6041,6 +6043,9 @@ Also, ignores heartbeats not from our target system'''
self.progress("Starting MAVProxy interaction as directed") self.progress("Starting MAVProxy interaction as directed")
self.mavproxy.interact() self.mavproxy.interact()
if self.reset_after_every_test:
reset_needed = True
if reset_needed: if reset_needed:
self.reset_SITL_commandline() self.reset_SITL_commandline()