[Android] Expose each try result in test results JSON.

build/android/pylib/results/json_results.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import collections
+import itertools
 import json
 
 from pylib.base import base_test_result
 
 
 def GenerateResultsDict(test_run_results):
   """Create a results dict from |test_run_results| suitable for writing to JSON.
   Args:
     test_run_results: a list of base_test_result.TestRunResults objects.
   Returns:
@@ skipping 11 matching lines @@
   #   "per_iteration_data": [
   #     {
   #       "test1": [
   #         {
   #           "status": "SUCCESS",
   #           "elapsed_time_ms": 1,
   #           "output_snippet": "",
   #           "output_snippet_base64": "",
   #           "losless_snippet": "",
   #         },
+  #         ...
   #       ],
   #       "test2": [
   #         {
   #           "status": "FAILURE",
   #           "elapsed_time_ms": 12,
   #           "output_snippet": "",
   #           "output_snippet_base64": "",
   #           "losless_snippet": "",
   #         },
+  #         ...
   #       ],
   #     },
   #     {
   #       "test1": [
   #         {
   #           "status": "SUCCESS",
   #           "elapsed_time_ms": 1,
   #           "output_snippet": "",
   #           "output_snippet_base64": "",
   #           "losless_snippet": "",
@@ skipping 23 matching lines @@
     elif s == base_test_result.ResultType.CRASH:
       return 'CRASH'
     elif s == base_test_result.ResultType.TIMEOUT:
       return 'TIMEOUT'
     elif s == base_test_result.ResultType.UNKNOWN:
       return 'UNKNOWN'
 
   all_tests = set()
   per_iteration_data = []
   for test_run_result in test_run_results:
-    iteration_data = {
-      t.GetName(): [{
-        'status': status_as_string(t.GetType()),
-        'elapsed_time_ms': t.GetDuration(),
-        'output_snippet': '',
-        'losless_snippet': '',
-        'output_snippet_base64:': '',
-      }]
-      for t in test_run_result.GetAll()
-    }
+    iteration_data = collections.defaultdict(list)
+    if isinstance(test_run_result, list):
+      results_iterable = itertools.chain(*(t.GetAll() for t in test_run_result))
+    else:
+      results_iterable = test_run_result.GetAll()
+
+    for r in results_iterable:
+      iteration_data[r.GetName()].append({
+          'status': status_as_string(r.GetType()),
+          'elapsed_time_ms': r.GetDuration(),
+          'output_snippet': '',
+          'losless_snippet': '',
+          'output_snippet_base64:': '',
+      })
+
     all_tests = all_tests.union(set(iteration_data.iterkeys()))
     per_iteration_data.append(iteration_data)
 
   return {
     'global_tags': [],
     'all_tests': sorted(list(all_tests)),
     # TODO(jbudorick): Add support for disabled tests within base_test_result.
     'disabled_tests': [],
     'per_iteration_data': per_iteration_data,
   }
@@ skipping 39 matching lines @@
   testsuite_runs = json_results['per_iteration_data']
   for testsuite_run in testsuite_runs:
     for test, test_runs in testsuite_run.iteritems():
       results_list.extend(
           [base_test_result.BaseTestResult(test,
                                            string_as_status(tr['status']),
                                            duration=tr['elapsed_time_ms'])
           for tr in test_runs])
   return results_list