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

build/android/pylib/results/json_results.py

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 80b3c32074f09a6e39c1254a4f74d3538b44296f..5822d6989e0241e915d6d555c880d054efea5184 100644
--- a/build/android/pylib/results/json_results.py
+++ b/build/android/pylib/results/json_results.py
@@ -7,6 +7,7 @@ import itertools
 import json
 
 from pylib.base import base_test_result
+from pylib.instrumentation import test_result
 
 
 def GenerateResultsDict(test_run_results):
@@ -96,13 +97,15 @@ def GenerateResultsDict(test_run_results):
       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)