Add an option to disable adding CC emails automatically
R=ehmaldonado@chromium.org, machenbach@chromium.org
Bug: 878303
Change-Id: Ia90001025babe692e481eb74fdbb4a66ce9a22f8
Reviewed-on: https://chromium-review.googlesource.com/1230074
Commit-Queue: Sergiy Byelozyorov <sergiyb@chromium.org>
Reviewed-by: Michael Achenbach <machenbach@chromium.org>
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py
index cb20c19..1e4b03c 100755
--- a/tests/git_cl_test.py
+++ b/tests/git_cl_test.py
@@ -765,9 +765,9 @@
((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
@classmethod
- def _upload_calls(cls, private):
+ def _upload_calls(cls, private, no_autocc):
return (cls._rietveld_git_base_calls() +
- cls._git_upload_calls(private))
+ cls._git_upload_calls(private, no_autocc))
@classmethod
def _rietveld_upload_no_rev_calls(cls):
@@ -809,12 +809,15 @@
]
@classmethod
- def _git_upload_calls(cls, private):
- if private:
+ def _git_upload_calls(cls, private, no_autocc):
+ if private or no_autocc:
cc_call = []
- private_call = []
else:
cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
+
+ if private:
+ private_call = []
+ else:
private_call = [
((['git', 'config', 'rietveld.private'],), '')]
@@ -887,15 +890,15 @@
returned_description,
final_description,
reviewers,
- private=False,
cc=None):
"""Generic reviewer test framework."""
self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
private = '--private' in upload_args
cc = cc or []
+ no_autocc = '--no-autocc' in upload_args
- self.calls = self._upload_calls(private)
+ self.calls = self._upload_calls(private, no_autocc)
def RunEditor(desc, _, **kwargs):
self.assertEquals(
@@ -933,6 +936,14 @@
'desc\n\nBUG=',
[])
+ def test_no_autocc(self):
+ self._run_reviewer_test(
+ ['--no-autocc'],
+ 'desc\n\nBUG=',
+ '# Blah blah comment.\ndesc\n\nBUG=\n',
+ 'desc\n\nBUG=',
+ [])
+
def test_reviewers_cmd_line(self):
# Reviewer is passed as-is
description = 'desc\n\nR=foo@example.com\nBUG='