From 34689cf949512b5230a7af29db369118c0f24711 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 30 Jun 2015 14:06:17 +1000 Subject: [PATCH] autotest: cope with mavproxy logging msg changes --- Tools/autotest/apmrover2.py | 2 +- Tools/autotest/arducopter.py | 4 ++-- Tools/autotest/arduplane.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Tools/autotest/apmrover2.py b/Tools/autotest/apmrover2.py index e434ae8a71..6abee086e5 100644 --- a/Tools/autotest/apmrover2.py +++ b/Tools/autotest/apmrover2.py @@ -100,7 +100,7 @@ def drive_APMrover2(viewerip=None, map=False): sil = util.start_SIL('APMrover2', model='rover', home=home, speedup=10) mavproxy = util.start_MAVProxy_SIL('APMrover2', options=options) - mavproxy.expect('Logging to (\S+)') + mavproxy.expect('Telemetry log: (\S+)') logfile = mavproxy.match.group(1) print("LOGFILE %s" % logfile) diff --git a/Tools/autotest/arducopter.py b/Tools/autotest/arducopter.py index 020e93a0ea..32a1ef105c 100644 --- a/Tools/autotest/arducopter.py +++ b/Tools/autotest/arducopter.py @@ -932,7 +932,7 @@ def fly_ArduCopter(viewerip=None, map=False): if map: options += ' --map' mavproxy = util.start_MAVProxy_SIL('ArduCopter', options=options) - mavproxy.expect('Logging to (\S+)') + mavproxy.expect('Telemetry log: (\S+)') logfile = mavproxy.match.group(1) print("LOGFILE %s" % logfile) @@ -1279,7 +1279,7 @@ def fly_CopterAVC(viewerip=None, map=False): if map: options += ' --map' mavproxy = util.start_MAVProxy_SIL('ArduCopter', options=options) - mavproxy.expect('Logging to (\S+)') + mavproxy.expect('Telemetry log: (\S+)') logfile = mavproxy.match.group(1) print("LOGFILE %s" % logfile) diff --git a/Tools/autotest/arduplane.py b/Tools/autotest/arduplane.py index d964606fd2..55841691c6 100644 --- a/Tools/autotest/arduplane.py +++ b/Tools/autotest/arduplane.py @@ -445,7 +445,7 @@ def fly_ArduPlane(viewerip=None, map=False): mavproxy = util.start_MAVProxy_SIL('ArduPlane', options=options) 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) # 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) mavproxy = util.start_MAVProxy_SIL('ArduPlane', options=options) - mavproxy.expect('Logging to (\S+)') + mavproxy.expect('Telemetry log: (\S+)') logfile = mavproxy.match.group(1) print("LOGFILE %s" % logfile)