From 7d7c4840b7fff84e4293c1496aaee5eccd79c0e6 Mon Sep 17 00:00:00 2001 From: Michael Moss Date: Thu, 14 Sep 2017 09:35:57 -0700 Subject: [PATCH] Add some differentiating details to gerrit step names. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit R=phajdan.jr@chromium.org Recipe-Manual-Change: release_scripts Recipe-Nontrivial-Roll: release_scripts Change-Id: I4c3ca01bad7e5158565a8abc8d7fc5b4b77b0d4f Reviewed-on: https://chromium-review.googlesource.com/666977 Commit-Queue: Michael Moss Reviewed-by: Paweł Hajdan Jr. --- recipes/recipe_modules/gerrit/api.py | 4 ++-- .../recipe_modules/gerrit/examples/full.expected/basic.json | 4 ++-- recipes/recipe_modules/gerrit/examples/full.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/recipes/recipe_modules/gerrit/api.py b/recipes/recipe_modules/gerrit/api.py index 7eca558c5..00cce04d3 100644 --- a/recipes/recipe_modules/gerrit/api.py +++ b/recipes/recipe_modules/gerrit/api.py @@ -39,7 +39,7 @@ class GerritApi(recipe_api.RecipeApi): '--commit', commit, '--json_file', self.m.json.output() ] - step_name = 'create_gerrit_branch' + step_name = 'create_gerrit_branch (%s %s)' % (project, branch) step_result = self(step_name, args, **kwargs) ref = step_result.json.output.get('ref') return ref @@ -60,7 +60,7 @@ class GerritApi(recipe_api.RecipeApi): '--branch', branch, '--json_file', self.m.json.output() ] - step_name='get_gerrit_branch' + step_name = 'get_gerrit_branch (%s %s)' % (project, branch) step_result = self(step_name, args, **kwargs) revision = step_result.json.output.get('revision') return revision diff --git a/recipes/recipe_modules/gerrit/examples/full.expected/basic.json b/recipes/recipe_modules/gerrit/examples/full.expected/basic.json index 6aeacafb3..3a4249fac 100644 --- a/recipes/recipe_modules/gerrit/examples/full.expected/basic.json +++ b/recipes/recipe_modules/gerrit/examples/full.expected/basic.json @@ -20,7 +20,7 @@ "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, - "name": "gerrit create_gerrit_branch", + "name": "gerrit create_gerrit_branch (v8/v8 test)", "~followup_annotations": [ "@@@STEP_LOG_LINE@json.output@{@@@", "@@@STEP_LOG_LINE@json.output@ \"can_delete\": true, @@@", @@ -49,7 +49,7 @@ "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, - "name": "gerrit get_gerrit_branch", + "name": "gerrit get_gerrit_branch (v8/v8 master)", "~followup_annotations": [ "@@@STEP_LOG_LINE@json.output@{@@@", "@@@STEP_LOG_LINE@json.output@ \"ref\": \"refs/heads/master\", @@@", diff --git a/recipes/recipe_modules/gerrit/examples/full.py b/recipes/recipe_modules/gerrit/examples/full.py index 5b7d8a473..76dd66498 100644 --- a/recipes/recipe_modules/gerrit/examples/full.py +++ b/recipes/recipe_modules/gerrit/examples/full.py @@ -50,11 +50,11 @@ def GenTests(api): yield ( api.test('basic') + api.step_data( - 'gerrit create_gerrit_branch', + 'gerrit create_gerrit_branch (v8/v8 test)', api.gerrit.make_gerrit_create_branch_response_data() ) + api.step_data( - 'gerrit get_gerrit_branch', + 'gerrit get_gerrit_branch (v8/v8 master)', api.gerrit.make_gerrit_get_branch_response_data() ) + api.step_data(