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

autotest: be more lenient with terrain report fetching

Browse Source
This commit is contained in:
Peter Barker 2022-06-11 15:26:53 +10:00 committed by Andrew Tridgell
parent 09ab90b8be
commit 2e0653ef71
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Tools/autotest/arduplane.py
View File

@ -2565,8 +2565,10 @@ function'''
# FIXME: once we have a pre-populated terrain cache this
# should require an instantly correct report to pass
tstart = self.get_sim_time_cached()
last_terrain_report_pending = -1
while True:
if self.get_sim_time_cached() - tstart > 60:
now = self.get_sim_time_cached()
if now - tstart > 60:
raise NotAchievedException("Did not get correct terrain report")
self.mav.mav.terrain_check_send(lat_int, lng_int)
@ -2576,6 +2578,14 @@ function'''
if report.spacing != 0:
break
# we will keep trying to long as the number of pending
# tiles is dropping:
if last_terrain_report_pending == -1:
last_terrain_report_pending = report.pending
elif report.pending < last_terrain_report_pending:
last_terrain_report_pending = report.pending
tstart = now
self.delay_sim_time(1)
self.progress(self.dump_message_verbose(report))