From 6047ef105ecd86db2058806557d4bc4a8b9507a4 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Thu, 6 Jun 2019 09:33:54 +1000 Subject: [PATCH] Tools: autotest: correct text MAVProxy-dedupe check in mission load This failed to protect against multiple rapid calls to load_mission --- Tools/autotest/common.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Tools/autotest/common.py b/Tools/autotest/common.py index 31f31e5e88..c31067b9f4 100644 --- a/Tools/autotest/common.py +++ b/Tools/autotest/common.py @@ -662,13 +662,13 @@ class AutoTest(ABC): t2 = self.get_sim_time_cached() if t2 - tstart > 10: raise AutoTestTimeoutException("Failed to do waypoint thing") - self.mavproxy.send('wp load %s\n' % path) - self.mavproxy.expect('Loaded ([0-9]+) waypoints from') - load_count = self.mavproxy.match.group(1) # the following hack is to get around MAVProxy statustext deduping: while time.time() - self.last_wp_load < 3: self.progress("Waiting for MAVProxy de-dupe timer to expire") time.sleep(1) + self.mavproxy.send('wp load %s\n' % path) + self.mavproxy.expect('Loaded ([0-9]+) waypoints from') + load_count = self.mavproxy.match.group(1) self.last_wp_load = time.time() self.mavproxy.expect("Flight plan received") self.mavproxy.send('wp list\n')