Use logdog butler subcommand to run tests.

build/android/test_runner.py

 #!/usr/bin/env python
 #
 # Copyright 2013 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.
 
 """Runs all types of tests from one unified interface."""
 
 import argparse
 import collections
 import contextlib
 import itertools
 import logging
 import os
+import shutil
 import signal
 import sys
 import threading
 import traceback
 import unittest
 
 import devil_chromium
 from devil import base_error
 from devil.android import device_blacklist
 from devil.android import device_errors
 from devil.android import device_utils
 from devil.android import forwarder
 from devil.android import ports
 from devil.utils import reraiser_thread
 from devil.utils import run_tests_helper
 
 from pylib import constants
 from pylib.base import base_test_result
 from pylib.base import environment_factory
 from pylib.base import test_instance_factory
 from pylib.base import test_run_factory
 from pylib.constants import host_paths
 from pylib.results import json_results
 from pylib.results import report_results
+from pylib.utils import logdog_helper

[dnj, 2017/02/28 18:28:38]

Don't know what this is. Why not just use the logdog library directly?

[BigBossZhiling, 2017/02/28 22:35:47]

This is a really simple wrapper written by Michael Case that does almost
nothing, except setting up the sys.path variables to include swarming_client
directory where the logdog butler is. But I don't have to change the sys.path
variable anymore and the helper create the stream_client for me.

Here is the file:
https://codesearch.chromium.org/chromium/src/build/android/pylib/utils/logdog...

 
 from py_utils import contextlib_ext
 
 
 _DEVIL_STATIC_CONFIG_FILE = os.path.abspath(os.path.join(
     host_paths.DIR_SOURCE_ROOT, 'build', 'android', 'devil_config.json'))
 
 
 def AddCommonOptions(parser):
   """Adds all common options to |parser|."""
@@ skipping 59 matching lines @@
                            'should be used.'))
   group.add_argument('--json-results-file', '--test-launcher-summary-output',
                      dest='json_results_file', type=os.path.realpath,
                      help='If set, will dump results in JSON form '
                           'to specified file.')
   group.add_argument('--trace-output', metavar='FILENAME',
                      type=os.path.realpath,
                      help='Path to save test_runner trace data to. This option '
                           'has been implemented for gtest, instrumentation '
                           'test and perf test.')
+  group.add_argument('--unified-logcats-file',
+                     dest='unified_logcats_file',
+                     help='The logcat file to upload to logdog.')
 
   logcat_output_group = group.add_mutually_exclusive_group()
   logcat_output_group.add_argument(
       '--logcat-output-dir', type=os.path.realpath,
       help='If set, will dump logcats recorded during test run to directory. '
            'File names will be the device ids with timestamps.')
   logcat_output_group.add_argument(
       '--logcat-output-file', type=os.path.realpath,
       help='If set, will merge logcats recorded during test run and dump them '
            'to the specified file.')
@@ skipping 639 matching lines @@
               test_name,
               ', '.join('%s %s' % (str(result_counts[test_name][i]), i)
                         for i in base_test_result.ResultType.GetTypes()))
         else:
           all_pass += 1
 
       logging.critical('%s of %s tests passed in all %s runs',
                        str(all_pass),
                        str(tot_tests),
                        str(iteration_count))
+  if args.unified_logcats_file:
+    with open(args.unified_logcats_file) as src:
+      with logdog_helper.open_text('unified_logcats') as dst:
+        shutil.copyfileobj(src, dst)
 
   if args.command == 'perf' and (args.steps or args.single_step):
     return 0
 
   return (0 if all(r.DidRunPass() for r in all_iteration_results)
           else constants.ERROR_EXIT_CODE)
 
 
 CommandConfigTuple = collections.namedtuple(
     'CommandConfigTuple',
@@ skipping 50 matching lines @@
     if e.is_infra_error:
       return constants.INFRA_EXIT_CODE
     return constants.ERROR_EXIT_CODE
   except: # pylint: disable=W0702
     logging.exception('Unrecognized error occurred.')
     return constants.ERROR_EXIT_CODE
 
 
 if __name__ == '__main__':
   sys.exit(main())