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 | 10 |
| (...skipping 12 matching lines...) Expand all Loading... | |
| 23 'org.chromium.native_test.ChromiumNativeTestInstrumentationTestRunner') | 23 'org.chromium.native_test.ChromiumNativeTestInstrumentationTestRunner') |
| 24 | 24 |
| 25 #override | 25 #override |
| 26 def TestPackage(self): | 26 def TestPackage(self): |
| 27 return self._test_instance.suite | 27 return self._test_instance.suite |
| 28 | 28 |
| 29 #override | 29 #override |
| 30 def _TriggerSetUp(self): | 30 def _TriggerSetUp(self): |
| 31 """Set up the triggering of a test run.""" | 31 """Set up the triggering of a test run.""" |
| 32 logging.info('Triggering test run.') | 32 logging.info('Triggering test run.') |
| 33 self._app_id = self._UploadAppToDevice(self._test_instance.apk) | |
| 34 | 33 |
| 35 if not self._env.runner_type: | 34 if not self._env.runner_type: |
| 36 runner_type = self.DEFAULT_RUNNER_TYPE | 35 runner_type = self.DEFAULT_RUNNER_TYPE |
| 37 logging.info('Using default runner type: %s', self.DEFAULT_RUNNER_TYPE) | 36 logging.info('Using default runner type: %s', self.DEFAULT_RUNNER_TYPE) |
| 38 else: | 37 else: |
| 39 runner_type = self._env.runner_type | 38 runner_type = self._env.runner_type |
| 40 | 39 |
| 41 if not self._env.runner_package: | 40 if not self._env.runner_package: |
| 42 runner_package = self.DEFAULT_RUNNER_PACKAGE | 41 runner_package = self.DEFAULT_RUNNER_PACKAGE |
| 43 logging.info('Using default runner package: %s', | 42 logging.info('Using default runner package: %s', |
| 44 self.DEFAULT_RUNNER_TYPE) | 43 self.DEFAULT_RUNNER_TYPE) |
| 45 else: | 44 else: |
| 46 runner_package = self._env.runner_package | 45 runner_package = self._env.runner_package |
| 47 | 46 |
| 48 self._test_id = self._UploadTestToDevice(runner_type) | 47 if runner_type == 'robotium': |
|
klundberg
2015/01/06 18:17:31
Similar comment about using "robotium" here. Seems
jbudorick
2015/01/06 18:25:57
The implementation _is_ specific to "robotium" tes
| |
| 49 config_body = {'runner': runner_package} | 48 dummy_app_path = os.path.join( |
| 50 self._SetTestConfig(runner_type, config_body) | 49 constants.GetOutDirectory(), 'apks', 'remote_device_dummy.apk') |
| 50 self._RobotiumSetup(dummy_app_path, self._test_instance.apk, | |
| 51 runner_package) | |
| 52 else: | |
| 53 raise Exception('unsupported runner_type: %s' % runner_type) | |
| 51 | 54 |
| 52 _INSTRUMENTATION_STREAM_LEADER = 'INSTRUMENTATION_STATUS: stream=' | 55 _INSTRUMENTATION_STREAM_LEADER = 'INSTRUMENTATION_STATUS: stream=' |
| 53 | 56 |
| 54 #override | 57 #override |
| 55 def _ParseTestResults(self): | 58 def _ParseTestResults(self): |
| 56 logging.info('Parsing results from stdout.') | 59 logging.info('Parsing results from stdout.') |
| 57 results = base_test_result.TestRunResults() | 60 results = base_test_result.TestRunResults() |
| 58 if self._results['results']['exception']: | 61 if self._results['results']['exception']: |
| 59 results.AddResult(base_test_result.BaseTestResult( | 62 results.AddResult(base_test_result.BaseTestResult( |
| 60 self._results['results']['exception'], | 63 self._results['results']['exception'], |
| 61 base_test_result.ResultType.FAIL)) | 64 base_test_result.ResultType.FAIL)) |
| 62 else: | 65 else: |
| 63 output = self._results['results']['output'].splitlines() | 66 output = self._results['results']['output'].splitlines() |
| 64 output = (l[len(self._INSTRUMENTATION_STREAM_LEADER):] for l in output | 67 output = (l[len(self._INSTRUMENTATION_STREAM_LEADER):] for l in output |
| 65 if l.startswith(self._INSTRUMENTATION_STREAM_LEADER)) | 68 if l.startswith(self._INSTRUMENTATION_STREAM_LEADER)) |
| 66 results_list = self._test_instance.ParseGTestOutput(output) | 69 results_list = self._test_instance.ParseGTestOutput(output) |
| 67 results.AddResults(results_list) | 70 results.AddResults(results_list) |
| 68 return results | 71 return results |
| OLD | NEW |