From add5243634355f85419d07824ed020f590c42007 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Sat, 13 Aug 2022 12:21:48 +1000 Subject: [PATCH] autotest: Rover: ensure we actually stop at rally point --- Tools/autotest/rover.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Tools/autotest/rover.py b/Tools/autotest/rover.py index df77211cc7..e15ff3282a 100644 --- a/Tools/autotest/rover.py +++ b/Tools/autotest/rover.py @@ -1239,11 +1239,8 @@ Brakes have negligible effect (with=%0.2fm without=%0.2fm delta=%0.2fm) if ex is not None: raise ex - def test_rally_points(self): - self.reboot_sitl() # to ensure starting point is as expected - + def Rally(self): self.load_rally("rover-test-rally.txt") - accuracy = self.get_parameter("WP_RADIUS") self.wait_ready_to_arm() self.arm_vehicle() @@ -1257,7 +1254,8 @@ Brakes have negligible effect (with=%0.2fm without=%0.2fm delta=%0.2fm) -105.229401, 0, 0) - self.wait_location(loc, accuracy=accuracy) + accuracy = self.get_parameter("WP_RADIUS") + self.wait_location(loc, accuracy=accuracy, minimum_duration=10) self.disarm_vehicle() def fence_with_bad_frame(self, target_system=1, target_component=1): @@ -6070,7 +6068,7 @@ Brakes have negligible effect (with=%0.2fm without=%0.2fm delta=%0.2fm) ("Rally", "Test Rally Points", - self.test_rally_points), + self.Rally), ("Offboard", "Test Offboard Control",