Index: build/android/run_instrumentation_tests.py |
diff --git a/build/android/run_instrumentation_tests.py b/build/android/run_instrumentation_tests.py |
index 12a15105075621a0fd28372a15b48d76f57043bd..4522ce8ea4ec8c4684e628cc9af24b03f29d9952 100755 |
--- a/build/android/run_instrumentation_tests.py |
+++ b/build/android/run_instrumentation_tests.py |
@@ -4,7 +4,7 @@ |
# Use of this source code is governed by a BSD-style license that can be |
# found in the LICENSE file. |
-"""Runs both the Python and Java tests.""" |
+"""Runs both the Python and Java instrumentation tests.""" |
import optparse |
import os |
@@ -16,7 +16,6 @@ from pylib import constants |
from pylib import ports |
from pylib.base import test_result |
from pylib.host_driven import run_python_tests |
-from pylib.instrumentation import apk_info |
from pylib.instrumentation import dispatch |
from pylib.utils import run_tests_helper |
from pylib.utils import test_options_parser |
@@ -42,14 +41,12 @@ def DispatchInstrumentationTests(options): |
if not ports.ResetTestServerPortAllocation(): |
raise Exception('Failed to reset test server port.') |
- start_date = int(time.time() * 1000) |
java_results = test_result.TestResults() |
python_results = test_result.TestResults() |
if options.run_java_tests: |
- java_results = dispatch.Dispatch( |
- options, |
- [apk_info.ApkInfo(options.test_apk_path, options.test_apk_jar_path)]) |
+ java_results = dispatch.Dispatch(options) |
+ |
if options.run_python_tests: |
python_results = run_python_tests.DispatchPythonTests(options) |