| 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 import collections | 5 import collections |
| 6 import itertools | 6 import itertools |
| 7 import json | 7 import json |
| 8 | 8 |
| 9 from pylib.base import base_test_result | 9 from pylib.base import base_test_result |
| 10 | 10 |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 95 results_iterable = test_run_result.GetAll() | 95 results_iterable = test_run_result.GetAll() |
| 96 | 96 |
| 97 for r in results_iterable: | 97 for r in results_iterable: |
| 98 result_dict = { | 98 result_dict = { |
| 99 'status': status_as_string(r.GetType()), | 99 'status': status_as_string(r.GetType()), |
| 100 'elapsed_time_ms': r.GetDuration(), | 100 'elapsed_time_ms': r.GetDuration(), |
| 101 'output_snippet': r.GetLog(), | 101 'output_snippet': r.GetLog(), |
| 102 'losless_snippet': '', | 102 'losless_snippet': '', |
| 103 'output_snippet_base64:': '', | 103 'output_snippet_base64:': '', |
| 104 'tombstones': r.GetTombstones() or '', | 104 'tombstones': r.GetTombstones() or '', |
| 105 'logcat_url': r.GetLogcatUrl() or '', |
| 105 } | 106 } |
| 106 iteration_data[r.GetName()].append(result_dict) | 107 iteration_data[r.GetName()].append(result_dict) |
| 107 | 108 |
| 108 all_tests = all_tests.union(set(iteration_data.iterkeys())) | 109 all_tests = all_tests.union(set(iteration_data.iterkeys())) |
| 109 per_iteration_data.append(iteration_data) | 110 per_iteration_data.append(iteration_data) |
| 110 | 111 |
| 111 return { | 112 return { |
| 112 'global_tags': [], | 113 'global_tags': [], |
| 113 'all_tests': sorted(list(all_tests)), | 114 'all_tests': sorted(list(all_tests)), |
| 114 # TODO(jbudorick): Add support for disabled tests within base_test_result. | 115 # TODO(jbudorick): Add support for disabled tests within base_test_result. |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 157 testsuite_runs = json_results['per_iteration_data'] | 158 testsuite_runs = json_results['per_iteration_data'] |
| 158 for testsuite_run in testsuite_runs: | 159 for testsuite_run in testsuite_runs: |
| 159 for test, test_runs in testsuite_run.iteritems(): | 160 for test, test_runs in testsuite_run.iteritems(): |
| 160 results_list.extend( | 161 results_list.extend( |
| 161 [base_test_result.BaseTestResult(test, | 162 [base_test_result.BaseTestResult(test, |
| 162 string_as_status(tr['status']), | 163 string_as_status(tr['status']), |
| 163 duration=tr['elapsed_time_ms']) | 164 duration=tr['elapsed_time_ms']) |
| 164 for tr in test_runs]) | 165 for tr in test_runs]) |
| 165 return results_list | 166 return results_list |
| 166 | 167 |
| OLD | NEW |