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

trunk/src/build/android/pylib/host_driven/run_python_tests.py

Index: trunk/src/build/android/pylib/host_driven/run_python_tests.py
===================================================================
--- trunk/src/build/android/pylib/host_driven/run_python_tests.py	(revision 210250)
+++ trunk/src/build/android/pylib/host_driven/run_python_tests.py	(working copy)
@@ -10,12 +10,13 @@
 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
 
@@ -55,16 +56,13 @@
 
   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)