Index: build/android/pylib/instrumentation/dispatch.py |
diff --git a/build/android/pylib/instrumentation/dispatch.py b/build/android/pylib/instrumentation/dispatch.py |
index 3f1e37ffac03c81b4cc61725ed1d28c62998b151..d718ea5e9a9aa02a930f8094257c77373e4f7607 100644 |
--- a/build/android/pylib/instrumentation/dispatch.py |
+++ b/build/android/pylib/instrumentation/dispatch.py |
@@ -10,6 +10,7 @@ import os |
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 |
@@ -25,7 +26,7 @@ def Dispatch(options): |
options: Command line options. |
Returns: |
- A TestRunResults object holding the results of the Java tests. |
+ Test results in a base_test_result.TestRunResults object. |
Raises: |
Exception: when there are no attached devices. |
@@ -42,9 +43,9 @@ def Dispatch(options): |
if not attached_devices: |
raise Exception('There are no devices online.') |
- if options.device: |
- assert options.device in attached_devices |
- attached_devices = [options.device] |
+ if options.test_device: |
+ assert options.test_device in attached_devices |
+ attached_devices = [options.test_device] |
if len(attached_devices) > 1 and options.wait_for_debugger: |
logging.warning('Debugger can not be sharded, using first available device') |