OLD | NEW |
1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 """Run specific test on specific environment.""" | 5 """Run specific test on specific environment.""" |
6 | 6 |
7 import logging | 7 import logging |
8 import os | 8 import os |
9 import sys | 9 import sys |
10 import tempfile | 10 import tempfile |
11 | 11 |
12 from pylib import constants | 12 from pylib import constants |
13 from pylib.base import base_test_result | 13 from pylib.base import base_test_result |
14 from pylib.remote.device import appurify_sanitized | 14 from pylib.remote.device import appurify_sanitized |
15 from pylib.remote.device import remote_device_test_run | 15 from pylib.remote.device import remote_device_test_run |
16 from pylib.remote.device import remote_device_helper | 16 from pylib.remote.device import remote_device_helper |
17 | 17 |
18 | 18 |
19 _EXTRA_COMMAND_LINE_FILE = ( | 19 _EXTRA_COMMAND_LINE_FILE = ( |
20 'org.chromium.native_test.ChromeNativeTestActivity.CommandLineFile') | 20 'org.chromium.native_test.NativeTestActivity.CommandLineFile') |
21 # TODO(jbudorick): Remove this extra when b/18981674 is fixed. | 21 # TODO(jbudorick): Remove this extra when b/18981674 is fixed. |
22 _EXTRA_ONLY_OUTPUT_FAILURES = ( | 22 _EXTRA_ONLY_OUTPUT_FAILURES = ( |
23 'org.chromium.native_test.ChromeNativeTestInstrumentationTestRunner.' | 23 'org.chromium.native_test.NativeTestInstrumentationTestRunner.' |
24 'OnlyOutputFailures') | 24 'OnlyOutputFailures') |
25 | 25 |
26 | 26 |
27 class RemoteDeviceGtestTestRun(remote_device_test_run.RemoteDeviceTestRun): | 27 class RemoteDeviceGtestTestRun(remote_device_test_run.RemoteDeviceTestRun): |
28 """Run gtests and uirobot tests on a remote device.""" | 28 """Run gtests and uirobot tests on a remote device.""" |
29 | 29 |
30 DEFAULT_RUNNER_PACKAGE = ( | 30 DEFAULT_RUNNER_PACKAGE = ( |
31 'org.chromium.native_test.ChromeNativeTestInstrumentationTestRunner') | 31 'org.chromium.native_test.NativeTestInstrumentationTestRunner') |
32 | 32 |
33 #override | 33 #override |
34 def TestPackage(self): | 34 def TestPackage(self): |
35 return self._test_instance.suite | 35 return self._test_instance.suite |
36 | 36 |
37 #override | 37 #override |
38 def _TriggerSetUp(self): | 38 def _TriggerSetUp(self): |
39 """Set up the triggering of a test run.""" | 39 """Set up the triggering of a test run.""" |
40 logging.info('Triggering test run.') | 40 logging.info('Triggering test run.') |
41 | 41 |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
77 output = (l[len(self._INSTRUMENTATION_STREAM_LEADER):] for l in output | 77 output = (l[len(self._INSTRUMENTATION_STREAM_LEADER):] for l in output |
78 if l.startswith(self._INSTRUMENTATION_STREAM_LEADER)) | 78 if l.startswith(self._INSTRUMENTATION_STREAM_LEADER)) |
79 results_list = self._test_instance.ParseGTestOutput(output) | 79 results_list = self._test_instance.ParseGTestOutput(output) |
80 results.AddResults(results_list) | 80 results.AddResults(results_list) |
81 if self._env.only_output_failures: | 81 if self._env.only_output_failures: |
82 logging.info('See logcat for more results information.') | 82 logging.info('See logcat for more results information.') |
83 if not self._results['results']['pass']: | 83 if not self._results['results']['pass']: |
84 results.AddResult(base_test_result.BaseTestResult( | 84 results.AddResult(base_test_result.BaseTestResult( |
85 'Remote Service detected error.', | 85 'Remote Service detected error.', |
86 base_test_result.ResultType.FAIL)) | 86 base_test_result.ResultType.FAIL)) |
87 return results | 87 return results |
OLD | NEW |