Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 06:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

autotest: fix race condition in DataFlashOverMAVLink test

Browse Source 
we're running at large speedups; 5 simulated seconds might not be enough time for MAVProxy to accumulate statistics.  So get MAVProxy to emit the rate each second instead
This commit is contained in:
Peter Barker 2024-07-08 18:54:09 +10:00 committed by Peter Barker
parent 3ca15b23b9
commit 91b2d0dcdf
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Tools/autotest/vehicle_test_suite.py
View File

@ -9991,13 +9991,13 @@ Also, ignores heartbeats not from our target system'''
self.arm_vehicle() self.arm_vehicle()
tstart = self.get_sim_time() tstart = self.get_sim_time()
last_status = 0 last_status = 0
mavproxy.send('repeat add 1 dataflash_logger status\n')
while True: while True:
now = self.get_sim_time() now = self.get_sim_time()
if now - tstart > 60: if now - tstart > 60:
break break
if now - last_status > 5: if now - last_status > 5:
last_status = now last_status = now
mavproxy.send('dataflash_logger status\n')
# seen on autotest: Active Rate(3s):97.790kB/s Block:164 Missing:0 Fixed:0 Abandoned:0 # seen on autotest: Active Rate(3s):97.790kB/s Block:164 Missing:0 Fixed:0 Abandoned:0
mavproxy.expect(r"Active Rate\([0-9]+s\):([0-9]+[.][0-9]+)") mavproxy.expect(r"Active Rate\([0-9]+s\):([0-9]+[.][0-9]+)")
rate = float(mavproxy.match.group(1)) rate = float(mavproxy.match.group(1))
@ -10008,6 +10008,7 @@ Also, ignores heartbeats not from our target system'''
if rate < desired_rate: if rate < desired_rate:
raise NotAchievedException("Exceptionally low transfer rate (%u < %u)" % (rate, desired_rate)) raise NotAchievedException("Exceptionally low transfer rate (%u < %u)" % (rate, desired_rate))
self.disarm_vehicle() self.disarm_vehicle()
mavproxy.send('repeat remove 0\n')
except Exception as e: except Exception as e:
self.print_exception_caught(e) self.print_exception_caught(e)
self.disarm_vehicle() self.disarm_vehicle()