Insert logcat as part of test result for android instrumentation tests.

build/android/pylib/instrumentation/instrumentation_test_instance.py

Index: build/android/pylib/instrumentation/instrumentation_test_instance.py
diff --git a/build/android/pylib/instrumentation/instrumentation_test_instance.py b/build/android/pylib/instrumentation/instrumentation_test_instance.py
index c98686a055c0a170d53a35a8ea79df4e9deec0f8..714756a20b6a4a074ece0be8dc30354994b81ec7 100644
--- a/build/android/pylib/instrumentation/instrumentation_test_instance.py
+++ b/build/android/pylib/instrumentation/instrumentation_test_instance.py
@@ -88,7 +88,7 @@ def ParseAmInstrumentRawOutput(raw_output):
 
 
 def GenerateTestResults(
-    result_code, result_bundle, statuses, start_ms, duration_ms):
+    result_code, result_bundle, statuses, start_ms, duration_ms, logcat=None):

[jbudorick, 2016/10/25 02:17:35]

This shouldn't be done in this function. Instead, you should set the logcat
after GenerateTestResults returns.

[BigBossZhiling, 2016/10/25 22:08:44]

Done.

   """Generate test results from |statuses|.
 
   Args:
@@ -124,6 +124,7 @@ def GenerateTestResults(
         results.append(current_result)
       current_result = test_result.InstrumentationTestResult(
           test_name, base_test_result.ResultType.UNKNOWN, start_ms, duration_ms)
+      current_result.SetLogcat(logcat)
     else:
       if status_code == instrumentation_parser.STATUS_CODE_OK:
         if bundle.get('test_skipped', '').lower() in ('true', '1', 'yes'):
@@ -705,9 +706,9 @@ class InstrumentationTestInstance(test_instance.TestInstance):
 
   @staticmethod
   def GenerateTestResults(
-      result_code, result_bundle, statuses, start_ms, duration_ms):
+      result_code, result_bundle, statuses, start_ms, duration_ms, logcat):
     return GenerateTestResults(result_code, result_bundle, statuses,
-                               start_ms, duration_ms)
+                               start_ms, duration_ms, logcat)
 
   #override
   def TearDown(self):