Index: build/android/pylib/host_driven/run_python_tests.py |
diff --git a/build/android/pylib/host_driven/run_python_tests.py b/build/android/pylib/host_driven/run_python_tests.py |
index 6a9bccc6db39520d8a9b515bae4c7fa21c517ac6..90ad2137c0921aae305780b8cb118a6f220c326d 100644 |
--- a/build/android/pylib/host_driven/run_python_tests.py |
+++ b/build/android/pylib/host_driven/run_python_tests.py |
@@ -10,13 +10,12 @@ 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 |
@@ -56,13 +55,16 @@ def DispatchPythonTests(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.device: |
- attached_devices = [options.device] |
+ if options.test_device: |
+ attached_devices = [options.test_device] |
test_collection = TestInfoCollection() |
all_tests = _GetAllTests(options.python_test_root, options.official_build) |
@@ -106,6 +108,20 @@ def DispatchPythonTests(options): |
return test_results |
+def Dispatch(options): |
+ """Wraps DispatchPythonTests to log and return the number of failed tests.""" |
+ |
+ results = DispatchPythonTests(options) |
+ report_results.LogFull( |
+ results=results, |
+ test_type='HostDriven', |
+ test_package=os.path.basename(options.test_apk), |
+ annotation=options.annotations, |
+ build_type=options.build_type, |
+ flakiness_server=options.flakiness_dashboard_server) |
+ return len(results.GetNotPass()) |
+ |
+ |
def _GetTestModules(python_test_root, is_official_build): |
"""Retrieve a sorted list of pythonDrivenTests. |