Add tombstones as part of json-results-file for android instr tests.

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
+from pylib.instrumentation import 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:
     A results dict that mirrors the one generated by
       base/test/launcher/test_results_tracker.cc:SaveSummaryAsJSON.
   """
@@ skipping 69 matching lines @@
   all_tests = set()
   per_iteration_data = []
   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))
     else:
       results_iterable = test_run_result.GetAll()
 
     for r in results_iterable:
-      iteration_data[r.GetName()].append({
+      result_dict = {
           'status': status_as_string(r.GetType()),
           'elapsed_time_ms': r.GetDuration(),
           'output_snippet': r.GetLog(),
           'losless_snippet': '',
-          'output_snippet_base64:': '',
-      })
+          'output_snippet_base64:': '',}

[jbudorick, 2016/08/17 04:14:30]

Move the } back down, please.

[BigBossZhiling, 2016/08/17 23:20:03]

Done.

+      if type(r) == test_result.InstrumentationTestResult:

[jbudorick, 2016/08/17 04:14:30]

We shouldn't be querying the derived type. If you want tombstones in the result,
add a GetTombstones method to base_test_result. We'll probably want it later for
gtests anyway.

[BigBossZhiling, 2016/08/17 23:20:03]

Done.

+        result_dict['tombstones'] = r.GetTombstones()
+      iteration_data[r.GetName()].append(result_dict)
 
     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 40 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