From bbff00dc0d234a123650cd504202082627b4e8d0 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Sat, 13 Aug 2022 12:37:31 +1000 Subject: [PATCH] autotest: be generous with mission upload timeouts A *lot* of simulated time can pass while the Python gets its act together. Allow a very large amount of time to pass while uploading missions. --- Tools/autotest/common.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Tools/autotest/common.py b/Tools/autotest/common.py index 4ff21a80f2..8d2eea63f7 100644 --- a/Tools/autotest/common.py +++ b/Tools/autotest/common.py @@ -7486,8 +7486,9 @@ Also, ignores heartbeats not from our target system''' mission_type) remaining_to_send = set(range(0, len(items))) sent = set() + timeout = (10 + len(items)/10.0) while True: - if self.get_sim_time_cached() - tstart > (10 + len(items)/10.0): + if self.get_sim_time_cached() - tstart > timeout: raise NotAchievedException("timeout uploading %s" % str(mission_type)) if len(remaining_to_send) == 0: self.progress("All sent") @@ -7534,6 +7535,9 @@ Also, ignores heartbeats not from our target system''' self.mav.mav.send(items[m.seq]) remaining_to_send.discard(m.seq) sent.add(m.seq) + + timeout += 10 # we received a good request for item; be generous with our timeouts + m = self.assert_receive_message('MISSION_ACK', timeout=1) if m.mission_type != mission_type: raise NotAchievedException("Mission ack not of expected mission type") @@ -7609,6 +7613,7 @@ Also, ignores heartbeats not from our target system''' if m.seq != next_to_request: raise NotAchievedException("Received waypoint is out of sequence") self.progress("Item %u OK" % m.seq) + timeout += 10 # we received an item; be generous with our timeouts items.append(m) next_to_request += 1 remaining_to_receive.discard(m.seq)