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 |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
66 self._AmInstrumentTestSetup( | 66 self._AmInstrumentTestSetup( |
67 dummy_app_path, self._test_instance.apk, runner_package, | 67 dummy_app_path, self._test_instance.apk, runner_package, |
68 environment_variables=env_vars) | 68 environment_variables=env_vars) |
69 | 69 |
70 _INSTRUMENTATION_STREAM_LEADER = 'INSTRUMENTATION_STATUS: stream=' | 70 _INSTRUMENTATION_STREAM_LEADER = 'INSTRUMENTATION_STATUS: stream=' |
71 | 71 |
72 #override | 72 #override |
73 def _ParseTestResults(self): | 73 def _ParseTestResults(self): |
74 logging.info('Parsing results from stdout.') | 74 logging.info('Parsing results from stdout.') |
75 results = base_test_result.TestRunResults() | 75 results = base_test_result.TestRunResults() |
76 if self._results['results']['exception']: | 76 output = self._results['results']['output'].splitlines() |
| 77 output = (l[len(self._INSTRUMENTATION_STREAM_LEADER):] for l in output |
| 78 if l.startswith(self._INSTRUMENTATION_STREAM_LEADER)) |
| 79 results_list = self._test_instance.ParseGTestOutput(output) |
| 80 results.AddResults(results_list) |
| 81 if self._env.only_output_failures: |
| 82 logging.info('See logcat for more results information.') |
| 83 if not self._results['results']['pass']: |
77 results.AddResult(base_test_result.BaseTestResult( | 84 results.AddResult(base_test_result.BaseTestResult( |
78 self._results['results']['exception'], | 85 'Remote Service detected error.', |
79 base_test_result.ResultType.FAIL)) | 86 base_test_result.ResultType.FAIL)) |
80 else: | 87 return results |
81 output = self._results['results']['output'].splitlines() | |
82 output = (l[len(self._INSTRUMENTATION_STREAM_LEADER):] for l in output | |
83 if l.startswith(self._INSTRUMENTATION_STREAM_LEADER)) | |
84 results_list = self._test_instance.ParseGTestOutput(output) | |
85 results.AddResults(results_list) | |
86 if self._env.only_output_failures: | |
87 logging.info('See logcat for more results information.') | |
88 if not self._results['results']['pass']: | |
89 results.AddResult(base_test_result.BaseTestResult( | |
90 'Remote Service detected error.', | |
91 base_test_result.ResultType.FAIL)) | |
92 return results | |
OLD | NEW |