Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(450)

Unified Diff: scripts/slave/recipe_modules/swarming/api.py

Issue 2150993005: Make _merge_isolated_script_shards robust to harness failures. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Addressed review feedback from vadimsh. Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | scripts/slave/recipe_modules/test_utils/test_api.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 30a173befc04396573e4c33e4bb3b069d1282be1..562afcbafdb4a86eb15984348f614250cb7649be 100644
--- a/scripts/slave/recipe_modules/swarming/api.py
+++ b/scripts/slave/recipe_modules/swarming/api.py
@@ -743,7 +743,10 @@ class SwarmingApi(recipe_api.RecipeApi):
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]
- results_json = self.m.json.loads(results_raw)
+ 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):
« no previous file with comments | « no previous file | scripts/slave/recipe_modules/test_utils/test_api.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698