OLD | NEW |
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2013 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 """Module containing utility functions for reporting results.""" | 5 """Module containing utility functions for reporting results.""" |
6 | 6 |
7 import logging | 7 import logging |
8 import os | 8 import os |
9 import re | 9 import re |
10 | 10 |
11 from pylib import constants | 11 from pylib import constants |
12 from pylib.utils import flakiness_dashboard_results_uploader | 12 |
| 13 import flakiness_dashboard_results_uploader |
13 | 14 |
14 | 15 |
15 def _LogToFile(results, test_type, suite_name): | 16 def _LogToFile(results, test_type, suite_name): |
16 """Log results to local files which can be used for aggregation later.""" | 17 """Log results to local files which can be used for aggregation later.""" |
17 log_file_path = os.path.join(constants.GetOutDirectory(), 'test_logs') | 18 log_file_path = os.path.join(constants.GetOutDirectory(), 'test_logs') |
18 if not os.path.exists(log_file_path): | 19 if not os.path.exists(log_file_path): |
19 os.mkdir(log_file_path) | 20 os.mkdir(log_file_path) |
20 full_file_name = os.path.join( | 21 full_file_name = os.path.join( |
21 log_file_path, re.sub('\W', '_', test_type).lower() + '.log') | 22 log_file_path, re.sub('\W', '_', test_type).lower() + '.log') |
22 if not os.path.exists(full_file_name): | 23 if not os.path.exists(full_file_name): |
(...skipping 16 matching lines...) Expand all Loading... |
39 logging.info('Upload results for test type "%s", test package "%s" to %s' % | 40 logging.info('Upload results for test type "%s", test package "%s" to %s' % |
40 (test_type, test_package, flakiness_server)) | 41 (test_type, test_package, flakiness_server)) |
41 | 42 |
42 # TODO(frankf): Enable uploading for gtests. | 43 # TODO(frankf): Enable uploading for gtests. |
43 if test_type != 'Instrumentation': | 44 if test_type != 'Instrumentation': |
44 logging.warning('Invalid test type.') | 45 logging.warning('Invalid test type.') |
45 return | 46 return |
46 | 47 |
47 try: | 48 try: |
48 if flakiness_server == constants.UPSTREAM_FLAKINESS_SERVER: | 49 if flakiness_server == constants.UPSTREAM_FLAKINESS_SERVER: |
49 assert test_package in ['ContentShellTest', | 50 assert test_package in ['ContentShellTest', |
50 'ChromiumTestShellTest', | 51 'ChromiumTestShellTest', |
51 'AndroidWebViewTest'] | 52 'AndroidWebViewTest'] |
52 dashboard_test_type = ('%s_instrumentation_tests' % | 53 dashboard_test_type = ('%s_instrumentation_tests' % |
53 test_package.lower().rstrip('test')) | 54 test_package.lower().rstrip('test')) |
54 # Downstream server. | 55 # Downstream server. |
55 else: | 56 else: |
56 dashboard_test_type = 'Chromium_Android_Instrumentation' | 57 dashboard_test_type = 'Chromium_Android_Instrumentation' |
57 | 58 |
58 flakiness_dashboard_results_uploader.Upload( | 59 flakiness_dashboard_results_uploader.Upload( |
59 results, flakiness_server, dashboard_test_type) | 60 results, flakiness_server, dashboard_test_type) |
60 except Exception as e: | 61 except Exception as e: |
61 logging.error(e) | 62 logging.error(e) |
62 | 63 |
63 | 64 |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
99 # instrumenation test package using different annotations. | 100 # instrumenation test package using different annotations. |
100 if annotation and len(annotation) == 1: | 101 if annotation and len(annotation) == 1: |
101 suite_name = annotation[0] | 102 suite_name = annotation[0] |
102 else: | 103 else: |
103 suite_name = test_package | 104 suite_name = test_package |
104 _LogToFile(results, test_type, suite_name) | 105 _LogToFile(results, test_type, suite_name) |
105 | 106 |
106 if flakiness_server: | 107 if flakiness_server: |
107 _LogToFlakinessDashboard(results, test_type, test_package, | 108 _LogToFlakinessDashboard(results, test_type, test_package, |
108 flakiness_server) | 109 flakiness_server) |
OLD | NEW |