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

build/android/pylib/instrumentation/instrumentation_test_instance.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 collections
 import copy
 import logging
 import os
 import pickle
 import re
@@ skipping 70 matching lines @@
         - the bundle dump as a dict mapping string keys to a list of
           strings, one for each line.
   """
   parser = instrumentation_parser.InstrumentationParser(raw_output)
   statuses = list(parser.IterStatus())
   code, bundle = parser.GetResult()
   return (code, bundle, statuses)
 
 
 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:
     result_code: The overall status code as an integer.
     result_bundle: The summary bundle dump as a dict.
     statuses: A list of 2-tuples containing:
       - the status code as an integer
       - the bundle dump as a dict mapping string keys to string values
       Note that this is the same as the third item in the 3-tuple returned by
       |_ParseAmInstrumentRawOutput|.
@@ skipping 15 matching lines @@
     if test_class and test_method:
       test_name = '%s#%s' % (test_class, test_method)
     else:
       continue
 
     if status_code == instrumentation_parser.STATUS_CODE_START:
       if current_result:
         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'):
           current_result.SetType(base_test_result.ResultType.SKIP)
         elif current_result.GetType() == base_test_result.ResultType.UNKNOWN:
           current_result.SetType(base_test_result.ResultType.PASS)
       elif status_code == instrumentation_parser.STATUS_CODE_SKIP:
         current_result.SetType(base_test_result.ResultType.SKIP)
       else:
         if status_code not in (instrumentation_parser.STATUS_CODE_ERROR,
@@ skipping 561 matching lines @@
           os.path.basename(test_list_file_path))
 
     return env
 
   @staticmethod
   def ParseAmInstrumentRawOutput(raw_output):
     return ParseAmInstrumentRawOutput(raw_output)
 
   @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):
     if self._isolate_delegate:
       self._isolate_delegate.Clear()