Include logcat created by StrictMode and test_runner_py.

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 os
 import posixpath
 import re
 import tempfile
 import time
@@ skipping 32 matching lines @@
 TIMEOUT_ANNOTATIONS = [
   ('Manual', 10 * 60 * 60),
   ('IntegrationTest', 30 * 60),
   ('External', 10 * 60),
   ('EnormousTest', 10 * 60),
   ('LargeTest', 5 * 60),
   ('MediumTest', 3 * 60),
   ('SmallTest', 1 * 60),
 ]
 
-LOGCAT_FILTERS = ['*:e', 'chromium:v', 'cr_*:v', 'DEBUG:I']
+LOGCAT_FILTERS = ['*:e', 'chromium:v', 'cr_*:v', 'DEBUG:I',
+                  'StrictMode:D', 'test_runner_py:I']

[jbudorick, 2017/05/21 19:10:29]

nit:

  '%s:I' % _TAG

instead of 

  'test_runner_py:I'

[BigBossZhiling, 2017/05/22 07:07:36]

Done.

 
 EXTRA_SCREENSHOT_FILE = (
     'org.chromium.base.test.ScreenshotOnFailureStatement.ScreenshotFile')
 
 FEATURE_ANNOTATION = 'Feature'
 RENDER_TEST_FEATURE_ANNOTATION = 'RenderTest'
 
 # This needs to be kept in sync with formatting in |RenderUtils.imageName|
 RE_RENDER_IMAGE_NAME = re.compile(
       r'(?P<test_class>\w+)\.'
@@ skipping 284 matching lines @@
           'render_test_output_dir')
       flags_to_add.append('--render-test-output-dir=%s' %
                           render_tests_device_output_dir)
 
     if flags_to_add or flags_to_remove:
       self._CreateFlagChangerIfNeeded(device)
       self._flag_changers[str(device)].PushFlags(
         add=flags_to_add, remove=flags_to_remove)
 
     try:
       device.RunShellCommand(

[jbudorick, 2017/05/21 19:10:29]

You'll need to move this call and the END call inside the logcat monitor context
manager. It may be easiest to do so by moving the two calls into their own
context manager, e.g.

  @contextlib.contextmanager
  def log_test_endpoints():
    # START call
    try:
      yield
    finally:
      # END call

and then using that inside the logcat monitor.

[BigBossZhiling, 2017/05/22 07:07:36]

Do you mean logdog logcat monitor? logcat monitor is in catapult. So I assume it
is in another cl?

[jbudorick, 2017/05/22 13:14:05]

Yeah, meant the LogdogLogcatMonitor below but was lazy about typing it.

[BigBossZhiling, 2017/05/22 21:11:03]

Done.

           ['log', '-p', 'i', '-t', _TAG, 'START %s' % test_name],
           check_return=True)
       time_ms = lambda: int(time.time() * 1e3)
       start_ms = time_ms()
 
       stream_name = 'logcat_%s_%s_%s' % (
           test_name.replace('#', '.'),
           time.strftime('%Y%m%dT%H%M%S-UTC', time.gmtime()),
           device.serial)
       logmon = logdog_logcat_monitor.LogdogLogcatMonitor(
           device.adb, stream_name, filter_specs=LOGCAT_FILTERS)
 
       with contextlib_ext.Optional(
           logmon, self._test_instance.should_save_logcat):

[jbudorick, 2017/05/22 13:14:05]

i.e., that logging needs to be done within this context manager in order to be
captured in the per-test logcats.

[BigBossZhiling, 2017/05/22 21:11:03]

Done.

         with contextlib_ext.Optional(
             trace_event.trace(test_name),
             self._env.trace_output):
           output = device.StartInstrumentation(
               target, raw=True, extras=extras, timeout=timeout, retries=0)
       logcat_url = logmon.GetLogcatURL()
     finally:
       device.RunShellCommand(
           ['log', '-p', 'i', '-t', _TAG, 'END %s' % test_name],
           check_return=True)
@@ skipping 263 matching lines @@
     timeout *= cls._GetTimeoutScaleFromAnnotations(annotations)
 
     return timeout
 
 def _IsRenderTest(test):
   """Determines if a test or list of tests has a RenderTest amongst them."""
   if not isinstance(test, list):
     test = [test]
   return any([RENDER_TEST_FEATURE_ANNOTATION in t['annotations'].get(
               FEATURE_ANNOTATION, {}).get('value', ()) for t in test])