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

autotest: make search of dflog for required messages faster

Browse Source 
Doing these in parallel means we don't need to parse the large file multiple times
This commit is contained in:
Peter Barker 2022-07-20 12:00:34 +10:00 committed by Peter Barker
parent c60f7bff91
commit 82337c9058
1 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
Tools/autotest/common.py
View File

@ -8827,29 +8827,36 @@ Also, ignores heartbeats not from our target system'''
# we should find at least one Armed event and one disarmed
# event, and at least one ARM message for arm and disarm
self.progress("Checking for an arm event")
dfreader = self.dfreader_for_current_onboard_log()
m = dfreader.recv_match(type="EV", condition="EV.Id==10") # armed
if m is None:
raise NotAchievedException("Did not find an Armed EV message")
wants = set([
("Armed EV message", "EV", lambda e : e.Id == 10),
("Disarmed EV message", "EV", lambda e : e.Id == 11),
("Armed ARM message", "ARM", lambda a : a.ArmState == 1),
("Disarmed ARM message", "ARM", lambda a : a.ArmState == 0),
])
self.progress("Checking for a disarm event")
dfreader = self.dfreader_for_current_onboard_log()
m = dfreader.recv_match(type="EV", condition="EV.Id==11") # disarmed
if m is None:
raise NotAchievedException("Did not find a disarmed EV message")
types = set()
for (name, msgtype, l) in wants:
types.add(msgtype)
self.progress("Checking for ARM.ArmState==1")
dfreader = self.dfreader_for_current_onboard_log()
m = dfreader.recv_match(type="ARM", condition="ARM.ArmState==1")
if m is None:
raise NotAchievedException("Did not find a armed ARM message")
while True:
m = dfreader.recv_match(type=types)
if m is None:
break
wantscopy = copy.copy(wants)
for want in wantscopy:
(name, msgtype, l) = want
if m.get_type() != msgtype:
continue
if l(m):
self.progress("Found %s" % name)
wants.discard(want)
if len(wants) == 0:
break
self.progress("Checking for ARM.ArmState==0")
dfreader = self.dfreader_for_current_onboard_log()
m = dfreader.recv_match(type="ARM", condition="ARM.ArmState==0")
if m is None:
raise NotAchievedException("Did not find a disarmed ARM message")
if len(wants):
msg = ", ".join([x[0] for x in wants])
raise NotAchievedException("Did not find (%s)" % msg)
self.progress("ALL PASS")
# TODO : Test arming magic;