From d2c82a25e81bf39b8a9e3da1350374e5c00d0594 Mon Sep 17 00:00:00 2001 From: hinoka Date: Wed, 10 Aug 2016 12:21:04 -0700 Subject: [PATCH] Bot_update recipe output: Add 'Try Rebasing' to patch failure output I still see confusion around patch failures. This should clearify things. BUG= Review-Url: https://codereview.chromium.org/2231953002 --- recipe_modules/bot_update/api.py | 2 +- .../example.expected/tryjob_fail_patch_download.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe_modules/bot_update/api.py b/recipe_modules/bot_update/api.py index 47846859e5..2e62e6fd24 100644 --- a/recipe_modules/bot_update/api.py +++ b/recipe_modules/bot_update/api.py @@ -276,7 +276,7 @@ class BotUpdateApi(recipe_api.RecipeApi): # This is download failure, hence an infra failure. # Sadly, python.failing_step doesn't support kwargs. self.m.python.inline( - 'Patch failure', + 'Patch failure - Try Rebasing', ('import sys;' 'print "Patch download failed. See bot_update step for' ' details";sys.exit(1)'), diff --git a/recipe_modules/bot_update/example.expected/tryjob_fail_patch_download.json b/recipe_modules/bot_update/example.expected/tryjob_fail_patch_download.json index 5ded8846cf..dca5a2580e 100644 --- a/recipe_modules/bot_update/example.expected/tryjob_fail_patch_download.json +++ b/recipe_modules/bot_update/example.expected/tryjob_fail_patch_download.json @@ -65,7 +65,7 @@ "-u", "import sys;print \"Patch download failed. See bot_update step for details\";sys.exit(1)" ], - "name": "Patch failure", + "name": "Patch failure - Try Rebasing", "~followup_annotations": [ "step returned non-zero exit code: 1", "@@@STEP_LOG_LINE@python.inline@import sys;print \"Patch download failed. See bot_update step for details\";sys.exit(1)@@@", @@ -75,7 +75,7 @@ }, { "name": "$result", - "reason": "Infra Failure: Step('Patch failure') returned 1", + "reason": "Infra Failure: Step('Patch failure - Try Rebasing') returned 1", "recipe_result": null, "status_code": 1 }