From a60f90e38e53738d3cf115cf0a6c75a0dfef0438 Mon Sep 17 00:00:00 2001 From: Garrett Beaty Date: Fri, 3 May 2024 21:39:28 +0000 Subject: [PATCH] Remove the root parameter from output_json. The downstream use has been switched to set patch_root instead so the root parameter is no longer necessary. Change-Id: Id0b20265550daa7e93af0ebf717d48db56164037 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5514209 Commit-Queue: Yiwei Zhang Auto-Submit: Garrett Beaty Reviewed-by: Yiwei Zhang --- recipes/recipe_modules/bot_update/test_api.py | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/recipes/recipe_modules/bot_update/test_api.py b/recipes/recipe_modules/bot_update/test_api.py index aecc6db8e..1e0f5b873 100644 --- a/recipes/recipe_modules/bot_update/test_api.py +++ b/recipes/recipe_modules/bot_update/test_api.py @@ -9,17 +9,14 @@ from recipe_engine import recipe_test_api class BotUpdateTestApi(recipe_test_api.RecipeTestApi): - def output_json( - self, - first_sln, - revision_mapping, - *, - # TODO(gbeaty) Switch downstream to patch_root, remove this - root=None, - patch_root=None, - fail_patch=False, - fixed_revisions=None, - commit_positions=True): + def output_json(self, + first_sln, + revision_mapping, + *, + patch_root=None, + fail_patch=False, + fixed_revisions=None, + commit_positions=True): """Deterministically synthesize json.output test data for gclient's --output-json option. """ @@ -62,7 +59,7 @@ class BotUpdateTestApi(recipe_test_api.RecipeTestApi): }) output.update({ - 'patch_root': root or patch_root, + 'patch_root': patch_root, 'root': first_sln, 'properties': properties, 'step_text': 'Some step text'