diff --git a/Tools/autotest/common.py b/Tools/autotest/common.py index 23acfa6056..fa3b3be2e9 100644 --- a/Tools/autotest/common.py +++ b/Tools/autotest/common.py @@ -4471,13 +4471,14 @@ class AutoTest(ABC): raise ValueError("count %u not handled" % count) self.progress("Rally content same") - def load_rally(self, filename): + def load_rally_using_mavproxy(self, filename): """Load rally points from a file to flight controller.""" self.progress("Loading rally points (%s)" % filename) path = os.path.join(testdir, self.current_test_name_directory, filename) mavproxy = self.start_mavproxy() mavproxy.send('rally load %s\n' % path) mavproxy.expect("Loaded") + self.delay_sim_time(10) # allow transfer to complete self.stop_mavproxy(mavproxy) def load_sample_mission(self): diff --git a/Tools/autotest/rover.py b/Tools/autotest/rover.py index 729b2b937b..080b749c05 100644 --- a/Tools/autotest/rover.py +++ b/Tools/autotest/rover.py @@ -1353,7 +1353,8 @@ Brakes have negligible effect (with=%0.2fm without=%0.2fm delta=%0.2fm) def Rally(self): '''Test Rally Points''' - self.load_rally("rover-test-rally.txt") + self.load_rally_using_mavproxy("rover-test-rally.txt") + self.assert_parameter_value('RALLY_TOTAL', 2) self.wait_ready_to_arm() self.arm_vehicle()