From c12e0fa3af96b369382e63bad3e78bb0da822eae Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Mon, 7 Feb 2022 13:24:59 +1100 Subject: [PATCH] autotest: reset rather than reboot if required on test fail --- Tools/autotest/common.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Tools/autotest/common.py b/Tools/autotest/common.py index 5eb1ab86e9..663a013c87 100644 --- a/Tools/autotest/common.py +++ b/Tools/autotest/common.py @@ -6570,8 +6570,12 @@ Also, ignores heartbeats not from our target system''' self.progress("Armed at end of test; force-rebooting SITL") self.disarm_vehicle(force=True) self.forced_post_test_sitl_reboots += 1 - self.progress("Force-resetting SITL") - self.reboot_sitl() # that'll learn it + if reset_needed: + self.progress("Force-resetting SITL") + self.reset_SITL_commandline() + else: + self.progress("Force-rebooting SITL") + self.reboot_sitl() # that'll learn it passed = False if self._mavproxy is not None: