autotest: tidy resetting of parameters after battery failsafe test

This commit is contained in:
Peter Barker 2021-11-20 10:38:13 +11:00 committed by Peter Barker
parent 67a87800f9
commit 445ee86734
1 changed files with 2 additions and 9 deletions

View File

@ -901,10 +901,10 @@ class AutoTestCopter(AutoTest):
self.setGCSfailsafe(0) self.setGCSfailsafe(0)
self.set_parameter('FS_OPTIONS', 0) self.set_parameter('FS_OPTIONS', 0)
self.progress("All GCS failsafe tests complete") self.progress("All GCS failsafe tests complete")
self.reboot_sitl()
# Tests all actions and logic behind the battery failsafe # Tests all actions and logic behind the battery failsafe
def fly_battery_failsafe(self, timeout=300): def fly_battery_failsafe(self, timeout=300):
self.context_push()
ex = None ex = None
try: try:
self.test_battery_failsafe(timeout=timeout) self.test_battery_failsafe(timeout=timeout)
@ -912,14 +912,7 @@ class AutoTestCopter(AutoTest):
self.print_exception_caught(e) self.print_exception_caught(e)
self.disarm_vehicle(force=True) self.disarm_vehicle(force=True)
ex = e ex = e
self.context_pop()
self.set_parameters({
'BATT_LOW_VOLT': 0,
'BATT_CRT_VOLT': 0,
'BATT_FS_LOW_ACT': 0,
'BATT_FS_CRT_ACT': 0,
'FS_OPTIONS': 0,
})
self.reboot_sitl() self.reboot_sitl()
if ex is not None: if ex is not None: