Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

autotest: avoid leaving message hooks around 

Can lead to some very weird and confusing output
This commit is contained in:
Peter Barker 2020-09-09 08:38:25 +10:00 committed by Peter Barker
parent 32de8d78ab
commit 51b54d3740
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Tools/autotest/arducopter.py
View File

@ -2570,7 +2570,7 @@ class AutoTestCopter(AutoTest):
0, # compass learning 0, # compass learning
0, 0,
timeout=timeout) timeout=timeout)
# long timeouts here because they're a pause before we start motors # long timeouts here because there's a pause before we start motors
self.wait_servo_channel_value(1, pwm_in, timeout=10) self.wait_servo_channel_value(1, pwm_in, timeout=10)
self.wait_servo_channel_value(4, pwm_in, timeout=10) self.wait_servo_channel_value(4, pwm_in, timeout=10)
self.wait_statustext("finished motor test") self.wait_statustext("finished motor test")
@ -2590,7 +2590,7 @@ class AutoTestCopter(AutoTest):
# since MOT_SPIN_MIN and MOT_SPIN_MAX are not set, the RC3 # since MOT_SPIN_MIN and MOT_SPIN_MAX are not set, the RC3
# min/max are used. # min/max are used.
expected_pwm = 1000 + (self.get_parameter("RC3_MAX") - self.get_parameter("RC3_MIN")) * percentage/100.0 expected_pwm = 1000 + (self.get_parameter("RC3_MAX") - self.get_parameter("RC3_MIN")) * percentage/100.0
self.progress("expected pwm=%f\n" % expected_pwm) self.progress("expected pwm=%f" % expected_pwm)
self.wait_servo_channel_value(1, expected_pwm, timeout=10) self.wait_servo_channel_value(1, expected_pwm, timeout=10)
self.wait_servo_channel_value(4, expected_pwm, timeout=10) self.wait_servo_channel_value(4, expected_pwm, timeout=10)
self.wait_statustext("finished motor test") self.wait_statustext("finished motor test")

2
Tools/autotest/arduplane.py
View File

@ -1990,6 +1990,8 @@ class AutoTestPlane(AutoTest):
self.progress("Caught exception: %s" % self.get_exception_stacktrace(e)) self.progress("Caught exception: %s" % self.get_exception_stacktrace(e))
ex = e ex = e
self.remove_message_hook(statustext_hook)
self.context_pop() self.context_pop()
if ex is not None: if ex is not None:
raise ex raise ex

19
Tools/autotest/common.py
View File

@ -4076,14 +4076,17 @@ Also, ignores heartbeats not from our target system'''
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())
statustext_found = True statustext_found = True
self.install_message_hook_context(mh) self.install_message_hook(mh)
tstart = self.get_sim_time() try:
while self.get_sim_time_cached() < tstart + timeout: tstart = self.get_sim_time()
if statustext_found: while self.get_sim_time_cached() < tstart + timeout:
return if statustext_found:
if the_function is not None: return
the_function() if the_function is not None:
m = self.mav.recv_match(type='STATUSTEXT', blocking=True, timeout=0.1) the_function()
m = self.mav.recv_match(type='STATUSTEXT', blocking=True, timeout=0.1)
finally:
self.remove_message_hook(mh)
raise AutoTestTimeoutException("Failed to receive text: %s" % raise AutoTestTimeoutException("Failed to receive text: %s" %
text.lower()) text.lower())