[Android] Log raw output for instrumentation test failures at info level.

build/android/pylib/local/device/local_device_instrumentation_test_run.py

 # Copyright 2015 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.
 
 import logging
 import re
 import time
 
 from devil.android import device_errors
 from devil.android import flag_changer
@@ skipping 227 matching lines @@
       output = device.StartInstrumentation(
           target, raw=True, extras=extras, timeout=timeout, retries=0)
       duration_ms = time_ms() - start_ms
     finally:
       if flags:
         self._flag_changers[str(device)].Restore()
       if test_timeout_scale:
         valgrind_tools.SetChromeTimeoutScale(
             device, self._test_instance.timeout_scale)
 
     # TODO(jbudorick): Make instrumentation tests output a JSON so this

[mikecase (-- gone --), 2016/04/20 22:50:31]

Is the TODO outdated? Don't instrumentation tests output a json currently. Can
you delete this.

[jbudorick, 2016/04/20 22:54:37]

No, this is to have the APK expose a JSON, not to have the test runner generate
one.

     # doesn't have to parse the output.
-    logging.debug('output from %s:', test_display_name)
-    for l in output:
-      logging.debug('  %s', l)
-
     result_code, result_bundle, statuses = (
         self._test_instance.ParseAmInstrumentRawOutput(output))
     results = self._test_instance.GenerateTestResults(
         result_code, result_bundle, statuses, start_ms, duration_ms)
     if flags:
       for r in results:
         if r.GetName() == test_name:
           r.SetName(test_display_name)
     if DidPackageCrashOnDevice(self._test_instance.test_package, device):
       for r in results:
         if r.GetType() == base_test_result.ResultType.UNKNOWN:
           r.SetType(base_test_result.ResultType.CRASH)
-    # TODO(jbudorick): ClearApplicationState on failure before switching
-    # instrumentation tests to platform mode (but respect --skip-clear-data).
+
+    if any(r.GetType() not in (base_test_result.ResultType.PASS,
+                               base_test_result.ResultType.SKIP)
+           for r in results):
+      logging.info('detected failure in %s. raw output:', test_display_name)
+      for l in output:
+        logging.info('  %s', l)
+      if (not self._env.skip_clear_data
+          and self._test_instance.package_info):
+        device.ClearApplicationState(self._test_instance.package_info.package)
+    else:
+      logging.debug('raw output from %s:', test_display_name)
+      for l in output:
+        logging.debug('  %s', l)
+
     return results
 
   #override
   def _ShouldShard(self):
     return True
 
   @classmethod
   def _GetTimeoutScaleFromAnnotations(cls, annotations):
     try:
       return int(annotations.get('TimeoutScale', 1))
     except ValueError as e:
       logging.warning("Non-integer value of TimeoutScale ignored. (%s)", str(e))
       return 1
 
   @classmethod
   def _GetTimeoutFromAnnotations(cls, annotations, test_name):
     for k, v in TIMEOUT_ANNOTATIONS:
       if k in annotations:
         timeout = v
         break
     else:
       logging.warning('Using default 1 minute timeout for %s', test_name)
       timeout = 60
 
     timeout *= cls._GetTimeoutScaleFromAnnotations(annotations)
 
     return timeout