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

Tools: autotest: use start_subtest in arming test

Browse Source
This commit is contained in:
Peter Barker 2019-03-01 11:55:54 +11:00 committed by Peter Barker
parent 39e7733872
commit 9dad451ef5
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Tools/autotest/common.py
View File

@ -1795,7 +1795,7 @@ class AutoTest(ABC):
# Rover and Sub don't have auto disarm # Rover and Sub don't have auto disarm
if self.is_copter() or self.is_plane(): if self.is_copter() or self.is_plane():
self.set_autodisarm_delay(0) self.set_autodisarm_delay(0)
self.start_test("Test normal arm and disarm features") self.start_subtest("Test normal arm and disarm features")
self.wait_ready_to_arm() self.wait_ready_to_arm()
self.progress("default arm_vehicle() call") self.progress("default arm_vehicle() call")
if not self.arm_vehicle(): if not self.arm_vehicle():
@ -1818,7 +1818,7 @@ class AutoTest(ABC):
if not self.disarm_motors_with_rc_input(): if not self.disarm_motors_with_rc_input():
raise NotAchievedException("Failed to disarm with RC input") raise NotAchievedException("Failed to disarm with RC input")
self.start_test("Test arm and disarm with switch") self.start_subtest("Test arm and disarm with switch")
arming_switch = 7 arming_switch = 7
self.set_parameter("RC%d_OPTION" % arming_switch, 41) self.set_parameter("RC%d_OPTION" % arming_switch, 41)
self.set_rc(arming_switch, 1000) self.set_rc(arming_switch, 1000)
@ -1831,7 +1831,7 @@ class AutoTest(ABC):
self.set_rc(arming_switch, 1000) self.set_rc(arming_switch, 1000)
if self.is_copter(): if self.is_copter():
self.start_test("Test arming failure with throttle too high") self.start_subtest("Test arming failure with throttle too high")
self.set_rc(3, 1800) self.set_rc(3, 1800)
try: try:
if self.arm_vehicle(): if self.arm_vehicle():
@ -1847,19 +1847,19 @@ class AutoTest(ABC):
self.set_rc(arming_switch, 1000) self.set_rc(arming_switch, 1000)
# Sub doesn't have 'stick commands' # Sub doesn't have 'stick commands'
self.start_test("Test arming failure with ARMING_RUDDER=0") self.start_subtest("Test arming failure with ARMING_RUDDER=0")
self.set_parameter("ARMING_RUDDER", 0) self.set_parameter("ARMING_RUDDER", 0)
if self.arm_motors_with_rc_input(): if self.arm_motors_with_rc_input():
raise NotAchievedException( raise NotAchievedException(
"Armed with rudder when ARMING_RUDDER=0") "Armed with rudder when ARMING_RUDDER=0")
self.start_test("Test disarming failure with ARMING_RUDDER=0") self.start_subtest("Test disarming failure with ARMING_RUDDER=0")
self.arm_vehicle() self.arm_vehicle()
if self.disarm_motors_with_rc_input(): if self.disarm_motors_with_rc_input():
raise NotAchievedException( raise NotAchievedException(
"Disarmed with rudder when ARMING_RUDDER=0") "Disarmed with rudder when ARMING_RUDDER=0")
self.disarm_vehicle() self.disarm_vehicle()
self.wait_heartbeat() self.wait_heartbeat()
self.start_test("Test disarming failure with ARMING_RUDDER=1") self.start_subtest("Test disarming failure with ARMING_RUDDER=1")
self.set_parameter("ARMING_RUDDER", 1) self.set_parameter("ARMING_RUDDER", 1)
self.arm_vehicle() self.arm_vehicle()
if self.disarm_motors_with_rc_input(): if self.disarm_motors_with_rc_input():
@ -1870,7 +1870,7 @@ class AutoTest(ABC):
self.set_parameter("ARMING_RUDDER", 2) self.set_parameter("ARMING_RUDDER", 2)
if self.is_copter(): if self.is_copter():
self.start_test("Test arming failure with interlock enabled") self.start_subtest("Test arming failure with interlock enabled")
self.set_rc(interlock_channel, 2000) self.set_rc(interlock_channel, 2000)
if self.arm_motors_with_rc_input(): if self.arm_motors_with_rc_input():
raise NotAchievedException( raise NotAchievedException(
@ -1883,7 +1883,7 @@ class AutoTest(ABC):
self.set_rc(arming_switch, 1000) self.set_rc(arming_switch, 1000)
self.set_rc(interlock_channel, 1000) self.set_rc(interlock_channel, 1000)
if self.is_heli(): if self.is_heli():
self.start_test("Test motor interlock enable can't be set while disarmed") self.start_subtest("Test motor interlock enable can't be set while disarmed")
self.set_rc(interlock_channel, 2000) self.set_rc(interlock_channel, 2000)
channel_field = "servo%u_raw" % interlock_channel channel_field = "servo%u_raw" % interlock_channel
interlock_value = self.get_parameter("SERVO%u_MIN" % interlock_channel) interlock_value = self.get_parameter("SERVO%u_MIN" % interlock_channel)