Updating the SwarmingIsolatedScriptTest to upload chartjson results to the

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 datetime
 import functools
 
 from recipe_engine import recipe_api
 
 
@@ skipping 714 matching lines @@
     # 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,
+      'chartjson': '',
     }
     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)
       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]
+          elif key is 'chartjson':
+            # Not sure if this is the correct way to merge the chartjson.  Also
+            # not sure if we will ever have more than one shard to merge.
+            merged_results[key].extend(results_json[key])

[Ken Russell (switch to Gerrit), 2016/09/12 19:35:41]

See above. I think we should write a new merge function which handles chartjson
results separately.

[eyaich1, 2016/09/13 16:52:59]

Done.

           else:
             raise recipe_api.InfraFailure(
               'Unknown key type ' + type(merged_results[key]) +
               ' when handling key ' + key + '.')  # pragma: no cover
     return merged_results
 
   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(
@@ skipping 228 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']