Chromium Code Reviews| Index: scripts/slave/recipe_modules/swarming/api.py |
| diff --git a/scripts/slave/recipe_modules/swarming/api.py b/scripts/slave/recipe_modules/swarming/api.py |
| index de26cf14f11a01db085f0a8f4b7654c3a986b60e..109be3c77e8c311276da5287904afd7bfdfda3a4 100644 |
| --- a/scripts/slave/recipe_modules/swarming/api.py |
| +++ b/scripts/slave/recipe_modules/swarming/api.py |
| @@ -732,6 +732,7 @@ class SwarmingApi(recipe_api.RecipeApi): |
| 'successes': [], |
| 'failures': [], |
| 'valid': True, |
| + 'chartjson': '', |
| } |
| for i in xrange(task.shards): |
| path = self.m.path.join(str(i), 'output.json') |
| @@ -748,6 +749,10 @@ class SwarmingApi(recipe_api.RecipeApi): |
| 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 fun
eyaich1
2016/09/13 16:52:59
Done.
|
| else: |
| raise recipe_api.InfraFailure( |
| 'Unknown key type ' + type(merged_results[key]) + |