From 6aac92db77151673df5eccae681857fa0c3f9834 Mon Sep 17 00:00:00 2001 From: recipe-roller Date: Tue, 14 Mar 2017 12:10:21 -0700 Subject: [PATCH] Roll recipe dependencies (nontrivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (e.g. depot_tools) into downstream projects (e.g. tools/build). Please review the expectation changes, and LGTM as normal. The recipe roller will *NOT* CQ the change itself, so you must CQ the change manually. More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug (or complain) recipe_engine: https://crrev.com/9fdd6d725d8d04125d43ce2be4f5e4b123f705be [json] improve output to get leak_to and better logging. (iannucci@chromium.org) R=iannucci@chromium.org Change-Id: Icf48ce2f5211e98b48d794a172be107562cf3b25 Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Reviewed-on: https://chromium-review.googlesource.com/455056 Commit-Queue: Commit-Queue: Robbie Iannucci Reviewed-by: Robbie Iannucci --- infra/config/recipes.cfg | 2 +- .../tryserver/example.expected/with_rietveld_patch.json | 5 +++-- .../tryserver/example.expected/with_rietveld_patch_new.json | 5 +++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg index a0f596d08..3c3d997d9 100644 --- a/infra/config/recipes.cfg +++ b/infra/config/recipes.cfg @@ -5,5 +5,5 @@ deps { project_id: "recipe_engine" url: "https://chromium.googlesource.com/external/github.com/luci/recipes-py.git" branch: "master" - revision: "05a33f9dcf2289bbaf233fcae1e2fb508d95f528" + revision: "9fdd6d725d8d04125d43ce2be4f5e4b123f705be" } diff --git a/recipe_modules/tryserver/example.expected/with_rietveld_patch.json b/recipe_modules/tryserver/example.expected/with_rietveld_patch.json index 71aa5c23d..291677b60 100644 --- a/recipe_modules/tryserver/example.expected/with_rietveld_patch.json +++ b/recipe_modules/tryserver/example.expected/with_rietveld_patch.json @@ -41,8 +41,9 @@ "name": "parse description", "stdin": "foobar", "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output (invalid)@null@@@", - "@@@STEP_LOG_END@json.output (invalid)@@@" + "@@@STEP_LOG_END@json.output (invalid)@@@", + "@@@STEP_LOG_LINE@json.output (exception)@No JSON object could be decoded@@@", + "@@@STEP_LOG_END@json.output (exception)@@@" ] }, { diff --git a/recipe_modules/tryserver/example.expected/with_rietveld_patch_new.json b/recipe_modules/tryserver/example.expected/with_rietveld_patch_new.json index 53498c6b2..4138eca50 100644 --- a/recipe_modules/tryserver/example.expected/with_rietveld_patch_new.json +++ b/recipe_modules/tryserver/example.expected/with_rietveld_patch_new.json @@ -41,8 +41,9 @@ "name": "parse description", "stdin": "foobar", "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output (invalid)@null@@@", - "@@@STEP_LOG_END@json.output (invalid)@@@" + "@@@STEP_LOG_END@json.output (invalid)@@@", + "@@@STEP_LOG_LINE@json.output (exception)@No JSON object could be decoded@@@", + "@@@STEP_LOG_END@json.output (exception)@@@" ] }, {