aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

autotest: fix flapping Rally test

Browse Source 
when MAVProxy says "loaded" it is only refering to getting the files into its own state, not into the autopilot
This commit is contained in:
Peter Barker 2023-08-29 13:03:44 +10:00 committed by Peter Barker
parent 0b04b265de
commit e69760f51b
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Tools/autotest/common.py
View File

@ -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):

3
Tools/autotest/rover.py
View File

@ -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()