Revert of (Reland) 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
 
 from pylib.constants import host_paths
 
 if host_paths.DEVIL_PATH not in sys.path:
   sys.path.append(host_paths.DEVIL_PATH)
 
 from devil import base_error
 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.results import json_results
 from pylib.results import report_results
-from pylib.utils import logdog_helper
 
 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 AddTestLauncherArgs(parser):
   """Adds arguments mirroring //base/test/launcher.
@@ skipping 154 matching lines @@
       type=os.path.realpath,
       help='Path to file with json list of device serials to '
            'run tests on. When not specified, all available '
            'devices are used.')
   parser.add_argument(
       '--tool',
       dest='tool',
       help='Run the test under a tool '
            '(use --tool help to list them)')
 
-  parser.add_argument(
-      '--upload-logcats-file',
-      action='store_true',
-      dest='upload_logcats_file',
-      help='Whether to upload logcat file to logdog.')
-
   logcat_output_group = parser.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 497 matching lines @@
     try:
       yield
     finally:
       json_results.GenerateJsonResultsFile(
           all_raw_results, args.json_results_file)
 
   json_writer = contextlib_ext.Optional(
       write_json_file(),
       args.json_results_file)
 
-  @contextlib.contextmanager
-  def upload_logcats_file():
-    try:
-      yield
-    finally:
-      if not args.logcat_output_file:
-        logging.critical('Cannot upload logcats file. '
-                        'File to save logcat is not specified.')
-      else:
-        with open(args.logcat_output_file) as src:
-          dst = logdog_helper.open_text('unified_logcats')
-          if dst:
-            shutil.copyfileobj(src, dst)
-
-  logcats_uploader = contextlib_ext.Optional(
-      upload_logcats_file(),
-      'upload_logcats_file' in args and args.upload_logcats_file)
-
   ### Set up test objects.
 
   env = environment_factory.CreateEnvironment(args, infra_error)
   test_instance = test_instance_factory.CreateTestInstance(args, infra_error)
   test_run = test_run_factory.CreateTestRun(
       args, env, test_instance, infra_error)
 
   ### Run.
 
-  with json_writer, logcats_uploader, env, test_instance, test_run:
+  with json_writer, env, test_instance, test_run:
 
     repetitions = (xrange(args.repeat + 1) if args.repeat >= 0
                    else itertools.count())
     result_counts = collections.defaultdict(
         lambda: collections.defaultdict(int))
     iteration_count = 0
     for _ in repetitions:
       raw_results = test_run.RunTests()
       if not raw_results:
         continue
@@ skipping 121 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())