Index: build/android/pylib/junit/test_runner.py |
diff --git a/build/android/pylib/junit/test_runner.py b/build/android/pylib/junit/test_runner.py |
index 35ac666fae887bc82c257893872a730cf5567b2c..a3f2aafb57c3256932563c565e5aa77e3e6394bd 100644 |
--- a/build/android/pylib/junit/test_runner.py |
+++ b/build/android/pylib/junit/test_runner.py |
@@ -2,10 +2,14 @@ |
# Use of this source code is governed by a BSD-style license that can be |
# found in the LICENSE file. |
+import json |
import os |
+import tempfile |
from pylib import cmd_helper |
from pylib import constants |
+from pylib.base import base_test_result |
+from pylib.results import json_results |
class JavaTestRunner(object): |
"""Runs java tests on the host.""" |
@@ -22,18 +26,23 @@ class JavaTestRunner(object): |
def RunTest(self, _test): |
"""Runs junit tests from |self._test_suite|.""" |
- command = ['java', |
- '-jar', os.path.join(constants.GetOutDirectory(), 'lib.java', |
- '%s.jar' % self._test_suite)] |
- if self._test_filter: |
- command.extend(['-gtest-filter', self._test_filter]) |
- if self._package_filter: |
- command.extend(['-package-filter', self._package_filter]) |
- if self._runner_filter: |
- command.extend(['-runner-filter', self._runner_filter]) |
- if self._sdk_version: |
- command.extend(['-sdk-version', self._sdk_version]) |
- return cmd_helper.RunCmd(command) |
+ with tempfile.NamedTemporaryFile() as json_file: |
+ command = ['java', |
+ '-jar', os.path.join(constants.GetOutDirectory(), 'lib.java', |
+ '%s.jar' % self._test_suite), '-json-results-file', |
jbudorick
2015/03/12 19:41:49
nit: drop this onto its own line w/ json_file.name
mikecase (-- gone --)
2015/03/13 01:07:23
Done.
|
+ json_file.name] |
+ if self._test_filter: |
+ command.extend(['-gtest-filter', self._test_filter]) |
+ if self._package_filter: |
+ command.extend(['-package-filter', self._package_filter]) |
+ if self._runner_filter: |
+ command.extend(['-runner-filter', self._runner_filter]) |
+ if self._sdk_version: |
+ command.extend(['-sdk-version', self._sdk_version]) |
+ return_code = cmd_helper.RunCmd(command) |
+ results_list = json_results.ParseResultsFromJson( |
+ json.loads(json_file.read())) |
+ return (results_list, return_code) |
def TearDown(self): |
pass |