Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-22 07:44:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

autotest: do not check prearm bit in dataflash-over-mavlink

Browse Source 
We won't be armable - but the other checks we make will ensure we get
the error we are looking for

Also use a more reliable way of draining the data from the autopilot
This commit is contained in:
Peter Barker 2020-12-06 11:59:19 +11:00 committed by Peter Barker
parent 5707d8ecc0
commit 38e324f141
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Tools/autotest/common.py
View File

@ -5773,7 +5773,7 @@ Also, ignores heartbeats not from our target system'''
try:
self.set_parameter("LOG_BACKEND_TYPE", 2)
self.reboot_sitl()
self.wait_ready_to_arm()
self.wait_ready_to_arm(check_prearm_bit=False)
self.mavproxy.send('arm throttle\n')
self.mavproxy.expect('PreArm: Logging failed')
self.mavproxy.send("module load dataflash_logger\n")
@ -5781,7 +5781,7 @@ Also, ignores heartbeats not from our target system'''
self.mavproxy.expect('logging started')
self.mavproxy.send("dataflash_logger set verbose 0\n")
self.delay_sim_time(1)
self.drain_mav() # hopefully draining COMMAND_ACK from that failed arm
self.do_timesync_roundtrip() # drain COMMAND_ACK from that failed arm
self.arm_vehicle()
tstart = self.get_sim_time()
last_status = 0
@ -5800,8 +5800,9 @@ Also, ignores heartbeats not from our target system'''
raise NotAchievedException("Exceptionally low transfer rate")
self.disarm_vehicle()
except Exception as e:
self.progress("Exception caught: %s" %
self.get_exception_stacktrace(e))
self.disarm_vehicle()
self.progress("Exception (%s) caught" % str(e))
ex = e
self.context_pop()
self.mavproxy.send("module unload dataflash_logger\n")