Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

autotest: correct some timeout issues around Copter takeoff

This commit is contained in:
Peter Barker 2021-01-12 20:13:26 +11:00 committed by Peter Barker
parent 0a39c49711
commit 8497f8fc73
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Tools/autotest/arducopter.py
View File

@ -126,12 +126,12 @@ class AutoTestCopter(AutoTest):
takeoff_throttle=1700,
require_absolute=True,
mode="STABILIZE",
timeout=30):
timeout=120):
"""Takeoff get to 30m altitude."""
self.progress("TAKEOFF")
self.change_mode(mode)
if not self.armed():
self.wait_ready_to_arm(require_absolute=require_absolute)
self.wait_ready_to_arm(require_absolute=require_absolute, timeout=timeout)
self.zero_throttle()
self.arm_vehicle()
self.set_rc(3, takeoff_throttle)
@ -2283,7 +2283,7 @@ class AutoTestCopter(AutoTest):
# takeoff to 10m in Loiter
self.progress("Moving to ensure location is tracked")
self.takeoff(10, mode="LOITER", require_absolute=True)
self.takeoff(10, mode="LOITER", require_absolute=True, timeout=720)
# fly forward in Loiter
self.set_rc(2, 1300)

2
Tools/autotest/common.py
View File

@ -4593,7 +4593,7 @@ class AutoTest(ABC):
if m is None:
raise NotAchievedException("Did not receive a home position")
if check_prearm_bit:
self.wait_prearm_sys_status_healthy()
self.wait_prearm_sys_status_healthy(timeout=timeout)
self.progress("Took %u seconds to become armable" % armable_time)
self.total_waiting_to_arm_time += armable_time
self.waiting_to_arm_count += 1