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 signal
+import subprocess
 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
@@ skipping 82 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('--upload-full-logcat',
+                     dest='upload_full_logcat',
+                     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.upload_full_logcat:
+    swarming_task_id = os.environ['SWARMING_TASK_ID']

[dnj, 2017/02/18 07:59:25]

This is being bootstrapped through Butler, right? That's the point of the
"mb.py" setup? So there is *no* point in running a second Butler instance to
upload logs when you have the bootstrap one available. As we discussed in our
meeting:

with open(args.upload_full_logcat) as src:
  with streamserver.text('unified_logcats') as dst:
    shutil.copyfileobj(src, dst)

And you can basically get rid of the rest of this code.

[BigBossZhiling, 2017/02/21 20:24:17]

Done.

+    project = 'chromium'
+    output = 'logdog,host=services-dot-luci-logdog.appspot.com'
+    prefix = 'android/swarming/logcats/%s' % swarming_task_id
+    service_account_json = ('/creds/service_accounts/'
+        'service-account-luci-logdog-publisher.json')
+
+    if not os.path.exists(args.upload_full_logcat):
+      logging.error(
+          'Logcat sources not found at %s. Unable to upload logcats.',
+          args.upload_full_logcat)
+    else:
+      stream_source_cmdline = [
+          '../../bin/logdog_butler', '-project', project,
+          '-output', output,
+          '-prefix', prefix,
+          '-service-account-json', service_account_json,
+          'stream', '-source', args.upload_full_logcat,
+          '-stream', '-name=unified_logcats']
+      subprocess.call(stream_source_cmdline)
 
   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())