Chromium Code Reviews| 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 | 11 |
| 11 from pylib import constants | 12 from pylib import constants |
| 12 from pylib.base import base_test_result | 13 from pylib.base import base_test_result |
| 13 from pylib.remote.device import appurify_sanitized | 14 from pylib.remote.device import appurify_sanitized |
| 14 from pylib.remote.device import remote_device_test_run | 15 from pylib.remote.device import remote_device_test_run |
| 15 from pylib.remote.device import remote_device_helper | 16 from pylib.remote.device import remote_device_helper |
| 16 | 17 |
| 17 | 18 |
| 19 _EXTRA_COMMAND_LINE_FILE = ( | |
| 20 'org.chromium.native_test.ChromeNativeTestActivity.CommandLineFile') | |
|
jbudorick
2015/01/13 19:26:28
oh, the other note: we have to do this via Command
| |
| 21 # TODO(jbudorick): Remove this extra when b/18981674 is fixed. | |
| 22 _EXTRA_ONLY_OUTPUT_FAILURES = ( | |
| 23 'org.chromium.native_test.ChromeNativeTestInstrumentationTestRunner.' | |
| 24 'OnlyOutputFailures') | |
| 25 | |
| 26 | |
| 18 class RemoteDeviceGtestRun(remote_device_test_run.RemoteDeviceTestRun): | 27 class RemoteDeviceGtestRun(remote_device_test_run.RemoteDeviceTestRun): |
| 19 """Run gtests and uirobot tests on a remote device.""" | 28 """Run gtests and uirobot tests on a remote device.""" |
| 20 | 29 |
| 21 DEFAULT_RUNNER_PACKAGE = ( | 30 DEFAULT_RUNNER_PACKAGE = ( |
| 22 'org.chromium.native_test.ChromeNativeTestInstrumentationTestRunner') | 31 'org.chromium.native_test.ChromeNativeTestInstrumentationTestRunner') |
| 23 | 32 |
| 24 #override | 33 #override |
| 25 def TestPackage(self): | 34 def TestPackage(self): |
| 26 return self._test_instance.suite | 35 return self._test_instance.suite |
| 27 | 36 |
| 28 #override | 37 #override |
| 29 def _TriggerSetUp(self): | 38 def _TriggerSetUp(self): |
| 30 """Set up the triggering of a test run.""" | 39 """Set up the triggering of a test run.""" |
| 31 logging.info('Triggering test run.') | 40 logging.info('Triggering test run.') |
| 32 | 41 |
| 33 if self._env.runner_type: | 42 if self._env.runner_type: |
| 34 logging.warning('Ignoring configured runner_type "%s"', | 43 logging.warning('Ignoring configured runner_type "%s"', |
| 35 self._env.runner_type) | 44 self._env.runner_type) |
| 36 | 45 |
| 37 if not self._env.runner_package: | 46 if not self._env.runner_package: |
| 38 runner_package = self.DEFAULT_RUNNER_PACKAGE | 47 runner_package = self.DEFAULT_RUNNER_PACKAGE |
| 39 logging.info('Using default runner package: %s', | 48 logging.info('Using default runner package: %s', |
| 40 self.DEFAULT_RUNNER_PACKAGE) | 49 self.DEFAULT_RUNNER_PACKAGE) |
| 41 else: | 50 else: |
| 42 runner_package = self._env.runner_package | 51 runner_package = self._env.runner_package |
| 43 | 52 |
| 44 dummy_app_path = os.path.join( | 53 dummy_app_path = os.path.join( |
| 45 constants.GetOutDirectory(), 'apks', 'remote_device_dummy.apk') | 54 constants.GetOutDirectory(), 'apks', 'remote_device_dummy.apk') |
| 46 self._AmInstrumentTestSetup(dummy_app_path, self._test_instance.apk, | 55 with tempfile.NamedTemporaryFile(suffix='.flags.txt') as flag_file: |
| 47 runner_package) | 56 env_vars = {} |
| 57 filter_string = self._test_instance._GenerateDisabledFilterString(None) | |
| 58 if filter_string: | |
| 59 flag_file.write('_ --gtest_filter=%s' % filter_string) | |
| 60 flag_file.flush() | |
| 61 env_vars[_EXTRA_COMMAND_LINE_FILE] = os.path.basename(flag_file.name) | |
| 62 self._test_instance._data_deps.append( | |
| 63 (os.path.abspath(flag_file.name), None)) | |
| 64 if self._env.only_output_failures: | |
| 65 env_vars[_EXTRA_ONLY_OUTPUT_FAILURES] = None | |
| 66 self._AmInstrumentTestSetup( | |
| 67 dummy_app_path, self._test_instance.apk, runner_package, | |
| 68 environment_variables=env_vars) | |
| 48 | 69 |
| 49 _INSTRUMENTATION_STREAM_LEADER = 'INSTRUMENTATION_STATUS: stream=' | 70 _INSTRUMENTATION_STREAM_LEADER = 'INSTRUMENTATION_STATUS: stream=' |
| 50 | 71 |
| 51 #override | 72 #override |
| 52 def _ParseTestResults(self): | 73 def _ParseTestResults(self): |
| 53 logging.info('Parsing results from stdout.') | 74 logging.info('Parsing results from stdout.') |
| 54 results = base_test_result.TestRunResults() | 75 results = base_test_result.TestRunResults() |
| 55 if self._results['results']['exception']: | 76 if self._results['results']['exception']: |
| 56 results.AddResult(base_test_result.BaseTestResult( | 77 results.AddResult(base_test_result.BaseTestResult( |
| 57 self._results['results']['exception'], | 78 self._results['results']['exception'], |
| 58 base_test_result.ResultType.FAIL)) | 79 base_test_result.ResultType.FAIL)) |
| 59 else: | 80 else: |
| 60 output = self._results['results']['output'].splitlines() | 81 output = self._results['results']['output'].splitlines() |
| 61 output = (l[len(self._INSTRUMENTATION_STREAM_LEADER):] for l in output | 82 output = (l[len(self._INSTRUMENTATION_STREAM_LEADER):] for l in output |
| 62 if l.startswith(self._INSTRUMENTATION_STREAM_LEADER)) | 83 if l.startswith(self._INSTRUMENTATION_STREAM_LEADER)) |
| 63 results_list = self._test_instance.ParseGTestOutput(output) | 84 results_list = self._test_instance.ParseGTestOutput(output) |
| 64 results.AddResults(results_list) | 85 results.AddResults(results_list) |
| 86 if self._env.only_output_failures: | |
| 87 logging.info('See logcat for more results information.') | |
| 65 if not self._results['results']['pass']: | 88 if not self._results['results']['pass']: |
| 66 results.AddResult(base_test_result.BaseTestResult( | 89 results.AddResult(base_test_result.BaseTestResult( |
| 67 'Remote Service detected error.', | 90 'Remote Service detected error.', |
| 68 base_test_result.ResultType.FAIL)) | 91 base_test_result.ResultType.FAIL)) |
| 69 return results | 92 return results |
| OLD | NEW |