| Index: tests/git_cl_test.py
|
| diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py
|
| index 1bb517e38223773a78a2e63fbeba80e6c5ecfbc9..2985d36c6e1eb6c5a96d7600814ff5d1ee472967 100755
|
| --- a/tests/git_cl_test.py
|
| +++ b/tests/git_cl_test.py
|
| @@ -884,7 +884,6 @@ class TestGitCl(TestCase):
|
| calls += [
|
| ((['git', 'rev-list',
|
| expected_upstream_ref + '..' + ref_to_push],), ''),
|
| - ((['git', 'config', 'rietveld.cc'],), '')
|
| ]
|
|
|
| notify_suffix = 'notify=%s' % ('ALL' if notify else 'NONE')
|
| @@ -893,9 +892,6 @@ class TestGitCl(TestCase):
|
| else:
|
| ref_suffix = '%' + notify_suffix
|
|
|
| - # Add cc from watch list.
|
| - ref_suffix += ',cc=joe@example.com'
|
| -
|
| if reviewers:
|
| ref_suffix += ',' + ','.join('r=%s' % email
|
| for email in sorted(reviewers))
|
| @@ -925,6 +921,12 @@ class TestGitCl(TestCase):
|
| ((['git', 'config', 'branch.master.gerritsquashhash',
|
| 'abcdef0123456789'],), ''),
|
| ]
|
| + calls += [
|
| + ((['git', 'config', 'rietveld.cc'],), ''),
|
| + ((['AddReviewers', 'chromium-review.googlesource.com',
|
| + 123456 if squash else None,
|
| + ['joe@example.com'], False],), ''),
|
| + ]
|
| calls += cls._git_post_upload_calls()
|
| return calls
|
|
|
| @@ -958,6 +960,9 @@ class TestGitCl(TestCase):
|
| self.mock(git_cl.gclient_utils, 'RunEditor',
|
| lambda *_, **__: self._mocked_call(['RunEditor']))
|
| self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
|
| + self.mock(git_cl.gerrit_util, 'AddReviewers',
|
| + lambda h, i, add, is_reviewer: self._mocked_call(
|
| + ['AddReviewers', h, i, add, is_reviewer]))
|
|
|
| self.calls = self._gerrit_base_calls(issue=issue)
|
| self.calls += self._gerrit_upload_calls(
|
|
|