Add json test results format support for SwarmingIsolatedScriptTest

scripts/slave/recipe_modules/swarming/api.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 logging
 import datetime
 import functools
 
 from recipe_engine import recipe_api
 
+from . import results_merger
 
 # Minimally supported version of swarming.py script (reported by --version).
 MINIMAL_SWARMING_VERSION = (0, 8, 6)
 
 
 def parse_time(value):
   """Converts serialized time from the API to datetime.datetime."""
   # When microseconds are 0, the '.123456' suffix is elided. This means the
   # serialized format is not consistent, which confuses the hell out of python.
   # TODO(maruel): Remove third format once we enforce version >=0.8.2.
@@ skipping 702 matching lines @@
 
         # Show any remaining isolated outputs (such as logcats).
         # Note that collect_gtest_task.py uses the default summary.json, which
         # only has 'outputs_ref' instead of the deprecated 'isolated_out'.
         for index, shard in enumerate(swarming_summary.get('shards', [])):
           outputs_ref = shard.get('outputs_ref')
           if outputs_ref:
             link_name = 'shard #%d isolated out' % index
             p.links[link_name] = outputs_ref['view_url']
 
-
   def _merge_isolated_script_chartjson_ouput_shards(self, task, step_result):
     # Taken from third_party/catapult/telemetry/telemetry/internal/results/
     # chart_json_output_formatter.py, the json entries are as follows:
     # result_dict = {
     #   'format_version': '0.1',
     #   'next_version': '0.2',
     #   'benchmark_name': benchmark_metadata.name,
     #   'benchmark_description': benchmark_metadata.description,
     #   'trace_rerun_options': benchmark_metadata.rerun_options,
     #   'benchmark_metadata': benchmark_metadata.AsDict(),
@@ skipping 19 matching lines @@
         merged_results = chartjson_results_json
         seen_first_shard = True
         continue
       for key in chartjson_results_json:
         if key == 'charts':
           # Append each additional chart to our merged results
           for add_key in chartjson_results_json[key]:
             merged_results[key][add_key] = chartjson_results_json[key][add_key]
     return merged_results
 
-
   def _merge_isolated_script_shards(self, task, step_result):
-    # This code is unfortunately specialized to the "simplified"
-    # JSON format that used to be the standard for recipes. The
-    # isolated scripts should be changed to use the now-standard
-    # Chromium JSON test results format:
-    # https://www.chromium.org/developers/the-json-test-results-format
-    # . Note that gtests, above, don't seem to conform to this
-    # format yet, so it didn't seem like a good prerequisite to
-    # switch the isolated tests over when adding sharding support.
-    #
-    # These are the only keys we pay attention to in the output JSON.
-    merged_results = {
-      'successes': [],
-      'failures': [],
-      'valid': True,
-    }
+    shard_results_list = []
     for i in xrange(task.shards):
       path = self.m.path.join(str(i), 'output.json')
       if path not in step_result.raw_io.output_dir:
         raise Exception('no results from shard #%d' % i)
       results_raw = step_result.raw_io.output_dir[path]
       try:
         results_json = self.m.json.loads(results_raw)
+        shard_results_list.append(results_json)
       except Exception as e:
         raise Exception('error decoding JSON results from shard #%d' % i)
-      for key in merged_results:
-        if key in results_json:
-          if isinstance(merged_results[key], list):
-            merged_results[key].extend(results_json[key])
-          elif isinstance(merged_results[key], bool):
-            merged_results[key] = merged_results[key] and results_json[key]
-          else:
-            raise recipe_api.InfraFailure(
-              'Unknown key type ' + type(merged_results[key]) +
-              ' when handling key ' + key + '.')  # pragma: no cover
-    return merged_results
+    return results_merger.merge_test_results(shard_results_list)
 
   def _isolated_script_collect_step(self, task, **kwargs):
     step_test_data = kwargs.pop('step_test_data', None)
     if not step_test_data:
       step_test_data = self.m.test_utils.test_api.canned_isolated_script_output(
           passing=True, is_win=self.m.platform.is_win, swarming=True)
 
     args=self.get_collect_cmd_args(task)
     args.extend(['--task-output-dir', self.m.raw_io.output_dir()])
 
@@ skipping 232 matching lines @@
 
   def get_shard_view_url(self, index):
     """Returns URL of HTML page with shard details or None if not available.
 
     Works only after the task has been successfully triggered.
     """
     if self._trigger_output and self._trigger_output.get('tasks'):
       for shard_dict in self._trigger_output['tasks'].itervalues():
         if shard_dict['shard_index'] == index:
           return shard_dict['view_url']