OLD | NEW |
1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 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 tempfile | 9 import tempfile |
10 | 10 |
(...skipping 15 matching lines...) Expand all Loading... |
26 """Set up the triggering of a test run.""" | 26 """Set up the triggering of a test run.""" |
27 logging.info('Triggering test run.') | 27 logging.info('Triggering test run.') |
28 self._AmInstrumentTestSetup( | 28 self._AmInstrumentTestSetup( |
29 self._test_instance._apk_under_test, self._test_instance.test_apk, | 29 self._test_instance._apk_under_test, self._test_instance.test_apk, |
30 self._test_instance.test_runner, environment_variables={}) | 30 self._test_instance.test_runner, environment_variables={}) |
31 | 31 |
32 #override | 32 #override |
33 def _ParseTestResults(self): | 33 def _ParseTestResults(self): |
34 logging.info('Parsing results from stdout.') | 34 logging.info('Parsing results from stdout.') |
35 r = base_test_result.TestRunResults() | 35 r = base_test_result.TestRunResults() |
36 | |
37 if self._results['results']['exception']: | |
38 r.AddResult(base_test_result.BaseTestResult( | |
39 self._results['results']['exception'], | |
40 base_test_result.ResultType.FAIL)) | |
41 return r | |
42 | |
43 result_code, result_bundle, statuses = ( | 36 result_code, result_bundle, statuses = ( |
44 self._test_instance.ParseAmInstrumentRawOutput( | 37 self._test_instance.ParseAmInstrumentRawOutput( |
45 self._results['results']['output'].splitlines())) | 38 self._results['results']['output'].splitlines())) |
46 result = self._test_instance.GenerateTestResults( | 39 result = self._test_instance.GenerateTestResults( |
47 result_code, result_bundle, statuses, 0, 0) | 40 result_code, result_bundle, statuses, 0, 0) |
48 | 41 |
49 if isinstance(result, base_test_result.BaseTestResult): | 42 if isinstance(result, base_test_result.BaseTestResult): |
50 r.AddResult(result) | 43 r.AddResult(result) |
51 elif isinstance(result, list): | 44 elif isinstance(result, list): |
52 r.AddResults(result) | 45 r.AddResults(result) |
53 else: | 46 else: |
54 raise Exception('Unexpected result type: %s' % type(result).__name__) | 47 raise Exception('Unexpected result type: %s' % type(result).__name__) |
55 | 48 |
56 return r | 49 return r |
OLD | NEW |