[Android] Split out the instrumentation test runner, sharder, and dispatcher.

build/android/pylib/host_driven/run_python_tests.py

 # Copyright (c) 2012 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 the Python tests (relies on using the Java test runner)."""
 
 import logging
 import os
 import sys
 import types
 
 from pylib import android_commands
 from pylib import constants
 from pylib.base.test_result import TestResults
 from pylib.instrumentation import apk_info
-from pylib.instrumentation import run_java_tests
-from pylib.instrumentation.run_java_tests import FatalTestException
+from pylib.instrumentation import test_runner
 
 import python_test_base
 from python_test_caller import CallPythonTest
 from python_test_sharder import PythonTestSharder
 from test_info_collection import TestInfoCollection
 
 
 def _GetPythonFiles(root, files):
   """Returns all files from |files| that end in 'Test.py'.
 
@@ skipping 26 matching lines @@
 
   Args:
     options: command line options.
 
   Returns:
     A list of test results.
   """
 
   attached_devices = android_commands.GetAttachedDevices()
   if not attached_devices:
-    raise FatalTestException('You have no devices attached or visible!')
+    raise Exception('You have no devices attached or visible!')
   if options.device:
     attached_devices = [options.device]
 
   test_collection = TestInfoCollection()
   all_tests = _GetAllTests(options.python_test_root, options.official_build)
   test_collection.AddTests(all_tests)
   test_names = [t.qualified_name for t in all_tests]
   logging.debug('All available tests: ' + str(test_names))
 
   available_tests = test_collection.GetAvailableTests(
       options.annotation, options.test_filter)
 
   if not available_tests:
     logging.warning('No Python tests to run with current args.')
     return TestResults()
 
   available_tests *= options.number_of_runs
   test_names = [t.qualified_name for t in available_tests]
   logging.debug('Final list of tests to run: ' + str(test_names))
 
   # Copy files to each device before running any tests.
   for device_id in attached_devices:
     logging.debug('Pushing files to device %s', device_id)
     apks = [apk_info.ApkInfo(options.test_apk_path, options.test_apk_jar_path)]
-    test_files_copier = run_java_tests.TestRunner(options, device_id,
-                                                  None, False, 0, apks, [])
+    test_files_copier = test_runner.TestRunner(options, device_id, None, False,
+                                               0, apks, [])
     test_files_copier.CopyTestFilesOnce()
 
   # Actually run the tests.
   if len(attached_devices) > 1 and options.wait_for_debugger:
     logging.warning('Debugger can not be sharded, '
                     'using first available device')
     attached_devices = attached_devices[:1]
   logging.debug('Running Python tests')
   sharder = PythonTestSharder(attached_devices, available_tests, options)
   test_results = sharder.RunShardedTests()
@@ skipping 98 matching lines @@
   Returns:
     List of test case objects for all available test methods.
   """
   if not test_root:
     return []
   all_tests = []
   test_module_list = _GetTestModules(test_root, is_official_build)
   for module in test_module_list:
     all_tests.extend(_GetTestClassesFromModule(module))
   return all_tests