From 828701bdf324588c8e203f7dc53b12c589f8f4bc Mon Sep 17 00:00:00 2001 From: Andrii Shyshkalov Date: Fri, 9 Dec 2016 10:46:47 +0100 Subject: [PATCH] Gerrit: git cl set-commit -d: don't spam reviwers/owner. R=sergiyb@chromium.org,machenbach@chromium.org BUG= Change-Id: Ia89e91479c22adeebc85a4432cd9f7b8d95a8fde Reviewed-on: https://chromium-review.googlesource.com/418655 Reviewed-by: Michael Achenbach Commit-Queue: Andrii Shyshkalov --- git_cl.py | 7 +++++-- tests/git_cl_test.py | 11 ++++++----- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/git_cl.py b/git_cl.py index 95d673dc1..46af2bce1 100755 --- a/git_cl.py +++ b/git_cl.py @@ -3023,8 +3023,11 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase): _CQState.DRY_RUN: 1, _CQState.COMMIT : 2, } - gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(), - labels={'Commit-Queue': vote_map[new_state]}) + kwargs = {'labels': {'Commit-Queue': vote_map[new_state]}} + if new_state == _CQState.DRY_RUN: + # Don't spam everybody reviewer/owner. + kwargs['notify'] = 'NONE' + gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(), **kwargs) def CannotTriggerTryJobReason(self): try: diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py index de6ebcce3..bd0f8d59d 100755 --- a/tests/git_cl_test.py +++ b/tests/git_cl_test.py @@ -2051,10 +2051,11 @@ class TestGitCl(TestCase): ] self.assertEqual(0, git_cl.main(['set-commit'])) - def _cmd_set_commit_gerrit_common(self, vote): + def _cmd_set_commit_gerrit_common(self, vote, notify=None): self.mock(git_cl.gerrit_util, 'SetReview', - lambda h, i, labels: self._mocked_call( - ['SetReview', h, i, labels])) + lambda h, i, labels, notify=None: + self._mocked_call(['SetReview', h, i, labels, notify])) + self.calls = [ ((['git', 'symbolic-ref', 'HEAD'],), 'feature'), ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1), @@ -2062,7 +2063,7 @@ class TestGitCl(TestCase): ((['git', 'config', 'branch.feature.gerritserver'],), 'https://chromium-review.googlesource.com'), ((['SetReview', 'chromium-review.googlesource.com', 123, - {'Commit-Queue': vote}],), ''), + {'Commit-Queue': vote}, notify],), ''), ] def test_cmd_set_commit_gerrit_clear(self): @@ -2070,7 +2071,7 @@ class TestGitCl(TestCase): self.assertEqual(0, git_cl.main(['set-commit', '-c'])) def test_cmd_set_commit_gerrit_dry(self): - self._cmd_set_commit_gerrit_common(1) + self._cmd_set_commit_gerrit_common(1, notify='NONE') self.assertEqual(0, git_cl.main(['set-commit', '-d'])) def test_cmd_set_commit_gerrit(self):