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

autotest: remove duplicate recovery code from set-message-interval test

Browse Source
This commit is contained in:
Peter Barker 2020-08-24 11:06:34 +10:00 committed by Peter Barker
parent 03d0eda7f1
commit 00bfe04539
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Tools/autotest/common.py
View File

@ -5335,6 +5335,7 @@ Also, ignores heartbeats not from our target system'''
def test_set_message_interval(self): def test_set_message_interval(self):
self.victim_message = 'VFR_HUD' self.victim_message = 'VFR_HUD'
self.victim_message_id = mavutil.mavlink.MAVLINK_MSG_ID_VFR_HUD self.victim_message_id = mavutil.mavlink.MAVLINK_MSG_ID_VFR_HUD
ex = None
try: try:
# tell MAVProxy to stop stuffing around with the rates: # tell MAVProxy to stop stuffing around with the rates:
self.mavproxy.send("set streamrate -1\n") self.mavproxy.send("set streamrate -1\n")
@ -5395,16 +5396,17 @@ Also, ignores heartbeats not from our target system'''
if m.result != mavutil.mavlink.MAV_RESULT_FAILED: if m.result != mavutil.mavlink.MAV_RESULT_FAILED:
raise NotAchievedException("Getting rate of unsupported message is a failure") raise NotAchievedException("Getting rate of unsupported message is a failure")
sr = self.sitl_streamrate()
self.mavproxy.send("set streamrate %u\n" % sr)
except Exception as e: except Exception as e:
self.progress("Caught exception: %s" % self.progress("Caught exception: %s" %
self.get_exception_stacktrace(e)) self.get_exception_stacktrace(e))
ex = e
# tell MAVProxy to start stuffing around with the rates: # tell MAVProxy to start stuffing around with the rates:
sr = self.sitl_streamrate() sr = self.sitl_streamrate()
self.mavproxy.send("set streamrate %u\n" % sr) self.mavproxy.send("set streamrate %u\n" % sr)
raise e
if ex is not None:
raise ex
def test_request_message(self, timeout=60): def test_request_message(self, timeout=60):
rate = round(self.get_message_rate("CAMERA_FEEDBACK", 10)) rate = round(self.get_message_rate("CAMERA_FEEDBACK", 10))