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

trunk/src/build/android/pylib/uiautomator/dispatch.py

Index: trunk/src/build/android/pylib/uiautomator/dispatch.py
===================================================================
--- trunk/src/build/android/pylib/uiautomator/dispatch.py	(revision 210250)
+++ trunk/src/build/android/pylib/uiautomator/dispatch.py	(working copy)
@@ -10,7 +10,6 @@
 from pylib import android_commands
 from pylib.base import base_test_result
 from pylib.base import shard
-from pylib.utils import report_results
 
 import test_package
 import test_runner
@@ -26,7 +25,7 @@
     options: Command line options.
 
   Returns:
-    Test results in a base_test_result.TestRunResults object.
+    A TestRunResults object holding the results of the Java tests.
 
   Raises:
     Exception: when there are no attached devices.
@@ -43,14 +42,13 @@
   if not attached_devices:
     raise Exception('There are no devices online.')
 
-  if options.test_device:
-    assert options.test_device in attached_devices
-    attached_devices = [options.test_device]
+  if options.device:
+    assert options.device in attached_devices
+    attached_devices = [options.device]
 
   def TestRunnerFactory(device, shard_index):
     return test_runner.TestRunner(
         options, device, shard_index, test_pkg, [])
 
-  return shard.ShardAndRunTests(TestRunnerFactory, attached_devices,
-                                tests, options.build_type,
-                                num_retries=options.num_retries)
+  return shard.ShardAndRunTests(TestRunnerFactory, attached_devices, tests,
+                                options.build_type)