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

autotest: use wait_statustext in place of mavproxy.expect for autorotate test

Browse Source
This commit is contained in:
Peter Barker 2021-03-01 11:39:21 +11:00 committed by Peter Barker
parent 6e2339d2d6
commit 34a52e9cfe
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Tools/autotest/arducopter.py
View File

@ -7014,11 +7014,14 @@ class AutoTestHeli(AutoTestCopter):
(start_alt + 5), (start_alt + 5),
relative=True, relative=True,
timeout=timeout) timeout=timeout)
self.context_collect('STATUSTEXT')
self.progress("Triggering autorotate by raising interlock") self.progress("Triggering autorotate by raising interlock")
self.set_rc(8, 1000) self.set_rc(8, 1000)
self.mavproxy.expect("SS Glide Phase") self.wait_statustext("SS Glide Phase", check_context=True)
self.mavproxy.expect("Hit ground at ([0-9.]+) m/s") self.wait_statustext(r"SIM Hit ground at ([0-9.]+) m/s",
speed = float(self.mavproxy.match.group(1)) check_context=True,
regex=True)
speed = float(self.re_match.group(1))
if speed > 30: if speed > 30:
raise NotAchievedException("Hit too hard") raise NotAchievedException("Hit too hard")
self.wait_disarmed() self.wait_disarmed()

3
Tools/autotest/common.py
View File

@ -5188,7 +5188,8 @@ Also, ignores heartbeats not from our target system'''
if m.get_type() != "STATUSTEXT": if m.get_type() != "STATUSTEXT":
return return
if regex: if regex:
if re.match(text, m.text): self.re_match = re.match(text, m.text)
if self.re_match:
statustext_found = True statustext_found = True
if text.lower() in m.text.lower(): if text.lower() in m.text.lower():
self.progress("Received expected text: %s" % m.text.lower()) self.progress("Received expected text: %s" % m.text.lower())