aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tools: autotest: shove resets shove-time to zero; eliminate race condition

Browse Source
This commit is contained in:
Peter Barker 2019-03-12 12:29:42 +11:00 committed by Peter Barker
parent 65d0443c26
commit f7ecba1a36
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Tools/autotest/arducopter.py
View File

@ -2707,18 +2707,22 @@ class AutoTestCopter(AutoTest):
self.change_mode('THROW')
self.wait_ready_to_arm()
self.arm_vehicle()
self.set_parameter("SIM_SHOVE_TIME", 500)
try:
self.set_parameter("SIM_SHOVE_TIME", 500)
except ValueError as e:
# the shove resets this to zero
pass
tstart = self.get_sim_time()
self.wait_mode('RTL')
max_good_tdelta = 5
max_good_tdelta = 15
tdelta = self.get_sim_time() - tstart
self.progress("Vehicle in RTL")
self.mav.motors_disarmed_wait()
self.progress("Vehicle disarmed")
if tdelta > max_good_tdelta:
self.progress("Took too long to enter RTL: %u > %u" %
(tdelta, max_good_tdelta))
raise NotAchievedException()
raise NotAchievedException("Took too long to enter RTL: %fs > %fs" %
(tdelta, max_good_tdelta))
self.progress("Vehicle returned")
def fly_precision_companion(self):