autotest: reset sitl if forced disarm fails

ArduPilot · Sep 10, 2022 · b06afa8 · b06afa8
1 parent 4caaf15
commit b06afa8
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/Tools/autotest/common.py b/Tools/autotest/common.py
@@ -7231,7 +7231,10 @@ def run_one_test_attempt(self, test, interact=False, attempt=1, do_fail_list=Tru
             if ex is None:
                 ex = ArmedAtEndOfTestException("Still armed at end of test")
             self.progress("Armed at end of test; force-rebooting SITL")
-            self.disarm_vehicle(force=True)
+            try:
+                self.disarm_vehicle(force=True)
+            except AutoTestTimeoutException:
+                reset_needed = True
             self.forced_post_test_sitl_reboots += 1
             if reset_needed:
                 self.progress("Force-resetting SITL")