From 3e4d068eff05622333decd07e92a7c04d45b2cd1 Mon Sep 17 00:00:00 2001 From: Marc Bonnici <marc.bonnici@arm.com> Date: Mon, 19 Dec 2016 15:53:12 +0000 Subject: [PATCH] NetStat: Updated Regex to match logcat format in android 6.0 Android marshmallow uses a different default view for logcat therefore prevented output from being extracted. The regex expression has been updated to include matching the new format. --- wlauto/instrumentation/netstats/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wlauto/instrumentation/netstats/__init__.py b/wlauto/instrumentation/netstats/__init__.py index 3e224369..5e64072c 100644 --- a/wlauto/instrumentation/netstats/__init__.py +++ b/wlauto/instrumentation/netstats/__init__.py @@ -16,7 +16,7 @@ from wlauto.utils.types import list_of_strings THIS_DIR = os.path.dirname(__file__) -NETSTAT_REGEX = re.compile(r'I/(?P<tag>netstats-\d+)\(\s*\d*\): (?P<ts>\d+) ' +NETSTAT_REGEX = re.compile(r'I[\/ ](?P<tag>netstats-\d+).*?: (?P<ts>\d+) ' r'"(?P<package>[^"]+)" TX: (?P<tx>\S+) RX: (?P<rx>\S+)')