Index: build/android/run_uiautomator_tests.py |
diff --git a/build/android/run_uiautomator_tests.py b/build/android/run_uiautomator_tests.py |
index 58c82445777bc691127043fee13874aa13cd79ed..c804b23d352af64eed4a8fdf6643ef27ffb1b239 100755 |
--- a/build/android/run_uiautomator_tests.py |
+++ b/build/android/run_uiautomator_tests.py |
@@ -14,9 +14,10 @@ import time |
from pylib import buildbot_report |
from pylib import constants |
from pylib import ports |
-from pylib.base import test_result |
+from pylib.base import base_test_result |
from pylib.host_driven import run_python_tests |
from pylib.instrumentation import dispatch |
+from pylib.utils import report_results |
from pylib.utils import run_tests_helper |
from pylib.utils import test_options_parser |
@@ -41,19 +42,15 @@ def DispatchUIAutomatorTests(options): |
if not ports.ResetTestServerPortAllocation(): |
raise Exception('Failed to reset test server port.') |
- java_results = test_result.TestResults() |
- python_results = test_result.TestResults() |
+ all_results = base_test_result.TestRunResults() |
if options.run_java_tests: |
- java_results = dispatch.Dispatch(options) |
- |
+ all_results.AddTestRunResults(dispatch.Dispatch(options)) |
if options.run_python_tests: |
- python_results = run_python_tests.DispatchPythonTests(options) |
- |
- all_results = test_result.TestResults.FromTestResults([java_results, |
- python_results]) |
+ all_results.AddTestRunResults(run_python_tests.DispatchPythonTests(options)) |
- all_results.LogFull( |
+ report_results.LogFull( |
+ results=all_results, |
test_type='UIAutomator', |
test_package=os.path.basename(options.uiautomator_jar), |
annotation=options.annotation, |