[Android] Improve error messaging for amp failures.

build/android/pylib/remote/device/remote_device_test_run.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Run specific test on specific environment."""
 
 import json
 import logging
 import os
 import re
 import shutil
 import string
 import tempfile
 import time
 import zipfile
 
 
 from pylib.base import base_test_result
 from pylib.base import test_run
 from pylib.remote.device import appurify_constants
 from pylib.remote.device import appurify_sanitized
 from pylib.remote.device import remote_device_helper
 from pylib.utils import zip_utils
 
 _DEVICE_OFFLINE_RE = re.compile('error: device not found')
-_LONG_MSG_RE = re.compile('longMsg=')
-_SHORT_MSG_RE = re.compile('shortMsg=')
+_LONG_MSG_RE = re.compile('longMsg=(.*)$')
+_SHORT_MSG_RE = re.compile('shortMsg=(.*)$')
 
 
 class RemoteDeviceTestRun(test_run.TestRun):
   """Run tests on a remote device."""
 
   _TEST_RUN_KEY = 'test_run'
   _TEST_RUN_ID_KEY = 'test_run_id'
 
   WAIT_TIME = 5
   COMPLETE = 'complete'
@@ skipping 321 matching lines @@
   def _DidDeviceGoOffline(self):
     zip_file = self._DownloadTestResults(None)
     with zipfile.ZipFile(zip_file) as z:
       adb_trace_log = z.read('adb_trace.log')
       if any(_DEVICE_OFFLINE_RE.search(l) for l in adb_trace_log.splitlines()):
         return True
     return False
 
   def _DetectPlatformErrors(self, results):
     if not self._results['results']['pass']:
-      if any(_SHORT_MSG_RE.search(l)
-          for l in self._results['results']['output'].splitlines()):
+      crash_msg = None
+      for line in self._results['results']['output'].splitlines():
+        m = _LONG_MSG_RE.search(line)
+        if m:
+          crash_msg = m.group(1)
+          break
+        m = _SHORT_MSG_RE.search(line)
+        if m:
+          crash_msg = m.group(1)
+      if crash_msg:
         self._LogLogcat()
-        for line in self._results['results']['output'].splitlines():
-          if _LONG_MSG_RE.search(line):
-            results.AddResult(base_test_result.BaseTestResult(
-                line.split('=')[1], base_test_result.ResultType.CRASH))
-            break
-        else:
-          results.AddResult(base_test_result.BaseTestResult(
-              'Unknown platform error detected.',
-              base_test_result.ResultType.UNKNOWN))
+        results.AddResult(base_test_result.BaseTestResult(
+            crash_msg, base_test_result.ResultType.CRASH))
       elif self._DidDeviceGoOffline():
         self._LogLogcat()
         self._LogAdbTraceLog()
         raise remote_device_helper.RemoteDeviceError(
             'Remote service unable to reach device.', is_infra_error=True)
       else:
-        results.AddResult(base_test_result.BaseTestResult(
-            'Remote Service detected error.',
-            base_test_result.ResultType.UNKNOWN))
+        # Remote service is reporting a failure, but no failure in results obj.
+        if results.DidRunPass():
+          results.AddResult(base_test_result.BaseTestResult(
+              'Remote Service detected error.',
+              base_test_result.ResultType.UNKNOWN))