Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-23 09:08:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

autotest: fixed MISSION_ITEM_INT receive to be reliable

Browse Source 
use a condition in recv_match() to ensure we don't mix up msgs from
other protocols
This commit is contained in:
Andrew Tridgell 2019-10-09 16:51:10 +11:00
parent 6ca28a0d11
commit 5d4ada8085
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/apmrover2.py
View File

@ -2128,7 +2128,8 @@ Brakes have negligible effect (with=%0.2fm without=%0.2fm delta=%0.2fm)
mission_type)
m = mav.recv_match(type='MISSION_ITEM_INT',
blocking=True,
timeout=1)
timeout=1,
condition='MISSION_ITEM_INT.mission_type==%u' % mission_type)
if m is None:
raise NotAchievedException("Did not receive mission item int")
if m.mission_type != mission_type:

3
Tools/autotest/common.py
View File

@ -2423,7 +2423,8 @@ class AutoTest(ABC):
mission_type)
m = self.mav.recv_match(type='MISSION_ITEM_INT',
blocking=True,
timeout=5)
timeout=5,
condition='MISSION_ITEM_INT.mission_type==%u' % mission_type)
self.progress("Got (%s)" % str(m))
if m is None:
raise NotAchievedException("Did not receive MISSION_ITEM_INT")