Revert 210035 "Creates a new test running script test_runner.py"

trunk/src/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 import base_test_result
 from pylib.instrumentation import test_package
 from pylib.instrumentation import test_runner
-from pylib.utils import report_results
 
 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'.
 
   Args:
     root: A directory name with python files.
     files: A list of file names.
@@ skipping 19 matching lines @@
 
 
 def DispatchPythonTests(options):
   """Dispatches the Python tests. If there are multiple devices, use sharding.
 
   Args:
     options: command line options.
 
   Returns:
     A list of test results.
-
-  Raises:
-    Exception: If there are no attached devices.
   """
 
   attached_devices = android_commands.GetAttachedDevices()
   if not attached_devices:
     raise Exception('You have no devices attached or visible!')
-  if options.test_device:
-    attached_devices = [options.test_device]
+  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.annotations, options.exclude_annotations, options.test_filter)
 
@@ skipping 127 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