Index: build/android/pylib/results/json_results.py |
diff --git a/build/android/pylib/results/json_results.py b/build/android/pylib/results/json_results.py |
index 7025a2502ef5fcd7df0d8a0b05340731e3bc6b64..e297e1fc7c3f2f7012216d5068b661afcc3acdaa 100644 |
--- a/build/android/pylib/results/json_results.py |
+++ b/build/android/pylib/results/json_results.py |
@@ -87,12 +87,16 @@ def GenerateResultsDict(test_run_results): |
all_tests = set() |
per_iteration_data = [] |
+ base_links = {} |
for test_run_result in test_run_results: |
iteration_data = collections.defaultdict(list) |
if isinstance(test_run_result, list): |
results_iterable = itertools.chain(*(t.GetAll() for t in test_run_result)) |
+ base_links.update({ |
+ k: v for tr in test_run_result for k, v in tr.GetLinks().items()}) |
mikecase (-- gone --)
2017/01/30 23:20:49
This is super awkward. Potentially overwrites lots
jbudorick
2017/01/31 16:11:53
this is also super awkward because it's a double d
mikecase (-- gone --)
2017/01/31 23:08:25
I mean. A few option. Make TestRunResults.SetLinks
jbudorick
2017/01/31 23:15:12
option 2 > option 3 > option 1
|
else: |
results_iterable = test_run_result.GetAll() |
+ base_links.update(test_run_result.GetLinks()) |
for r in results_iterable: |
result_dict = { |
@@ -101,8 +105,7 @@ def GenerateResultsDict(test_run_results): |
'output_snippet': r.GetLog(), |
'losless_snippet': '', |
'output_snippet_base64:': '', |
- 'tombstones': r.GetTombstonesUrl() or '', |
- 'logcat_url': r.GetLogcatUrl() or '', |
+ 'links': r.GetLinks(), |
} |
iteration_data[r.GetName()].append(result_dict) |
@@ -115,6 +118,7 @@ def GenerateResultsDict(test_run_results): |
# TODO(jbudorick): Add support for disabled tests within base_test_result. |
'disabled_tests': [], |
'per_iteration_data': per_iteration_data, |
+ 'links': base_links, |
} |