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

autotest: cope with mavproxy logging msg changes

Browse Source
This commit is contained in:
Andrew Tridgell 2015-06-30 14:06:17 +10:00
parent ac3200fd32
commit 34689cf949
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tools/autotest/apmrover2.py
View File

@ -100,7 +100,7 @@ def drive_APMrover2(viewerip=None, map=False):
sil = util.start_SIL('APMrover2', model='rover', home=home, speedup=10) sil = util.start_SIL('APMrover2', model='rover', home=home, speedup=10)
mavproxy = util.start_MAVProxy_SIL('APMrover2', options=options) mavproxy = util.start_MAVProxy_SIL('APMrover2', options=options)
mavproxy.expect('Logging to (\S+)') mavproxy.expect('Telemetry log: (\S+)')
logfile = mavproxy.match.group(1) logfile = mavproxy.match.group(1)
print("LOGFILE %s" % logfile) print("LOGFILE %s" % logfile)

4
Tools/autotest/arducopter.py
View File

@ -932,7 +932,7 @@ def fly_ArduCopter(viewerip=None, map=False):
if map: if map:
options += ' --map' options += ' --map'
mavproxy = util.start_MAVProxy_SIL('ArduCopter', options=options) mavproxy = util.start_MAVProxy_SIL('ArduCopter', options=options)
mavproxy.expect('Logging to (\S+)') mavproxy.expect('Telemetry log: (\S+)')
logfile = mavproxy.match.group(1) logfile = mavproxy.match.group(1)
print("LOGFILE %s" % logfile) print("LOGFILE %s" % logfile)
@ -1279,7 +1279,7 @@ def fly_CopterAVC(viewerip=None, map=False):
if map: if map:
options += ' --map' options += ' --map'
mavproxy = util.start_MAVProxy_SIL('ArduCopter', options=options) mavproxy = util.start_MAVProxy_SIL('ArduCopter', options=options)
mavproxy.expect('Logging to (\S+)') mavproxy.expect('Telemetry log: (\S+)')
logfile = mavproxy.match.group(1) logfile = mavproxy.match.group(1)
print("LOGFILE %s" % logfile) print("LOGFILE %s" % logfile)

4
Tools/autotest/arduplane.py
View File

@ -445,7 +445,7 @@ def fly_ArduPlane(viewerip=None, map=False):
mavproxy = util.start_MAVProxy_SIL('ArduPlane', options=options) mavproxy = util.start_MAVProxy_SIL('ArduPlane', options=options)
util.expect_setup_callback(mavproxy, expect_callback) util.expect_setup_callback(mavproxy, expect_callback)
mavproxy.expect('Logging to (\S+)') mavproxy.expect('Telemetry log: (\S+)')
mavproxy.expect('Received [0-9]+ parameters',timeout=3000) mavproxy.expect('Received [0-9]+ parameters',timeout=3000)
# setup test parameters # setup test parameters
@ -460,7 +460,7 @@ def fly_ArduPlane(viewerip=None, map=False):
sil = util.start_SIL('ArduPlane', model='jsbsim', home=HOME_LOCATION, speedup=10) sil = util.start_SIL('ArduPlane', model='jsbsim', home=HOME_LOCATION, speedup=10)
mavproxy = util.start_MAVProxy_SIL('ArduPlane', options=options) mavproxy = util.start_MAVProxy_SIL('ArduPlane', options=options)
mavproxy.expect('Logging to (\S+)') mavproxy.expect('Telemetry log: (\S+)')
logfile = mavproxy.match.group(1) logfile = mavproxy.match.group(1)
print("LOGFILE %s" % logfile) print("LOGFILE %s" % logfile)