Automatically CC folks listed in CC= lines.

tests/git_cl_test.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Unit tests for git_cl.py."""
 
 import json
 import os
 import StringIO
@@ skipping 581 matching lines @@
        ''),
       ((['git', 'config', 'rietveld.force-https-commit-url'],), ''),
       ((['git',
          'svn', 'dcommit', '-C50', '--no-rebase', '--rmdir'],),
        (('', None), 0)),
       ((['git', 'checkout', '-q', 'working'],), ''),
       ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
   ]
 
   @staticmethod
-  def _cmd_line(description, args, similarity, find_copies, private):
+  def _cmd_line(description, args, similarity, find_copies, private, cc):
     """Returns the upload command line passed to upload.RealMain()."""
     return [
         'upload', '--assume_yes', '--server',
         'https://codereview.example.com',
         '--message', description
     ] + args + [
-        '--cc', 'joe@example.com',
+        '--cc', ','.join(['joe@example.com'] + cc),
     ] + (['--private'] if private else []) + [
         '--git_similarity', similarity or '50'
     ] + (['--git_no_find_copies'] if find_copies == False else []) + [
         'fake_ancestor_sha', 'HEAD'
     ]
 
   def _run_reviewer_test(
       self,
       upload_args,
       expected_description,
       returned_description,
       final_description,
       reviewers,
-      private=False):
+      private=False,
+      cc=None):
     """Generic reviewer test framework."""
     self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
     try:
       similarity = upload_args[upload_args.index('--similarity')+1]
     except ValueError:
       similarity = None
 
     if '--find-copies' in upload_args:
       find_copies = True
     elif '--no-find-copies' in upload_args:
       find_copies = False
     else:
       find_copies = None
 
     private = '--private' in upload_args
+    cc = cc or []
 
     self.calls = self._upload_calls(similarity, find_copies, private)
 
     def RunEditor(desc, _, **kwargs):
       self.assertEquals(
           '# Enter a description of the change.\n'
           '# This will be displayed on the codereview site.\n'
           '# The first line will also be used as the subject of the review.\n'
           '#--------------------This line is 72 characters long'
           '--------------------\n' +
           expected_description,
           desc)
       return returned_description
     self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
 
     def check_upload(args):
       cmd_line = self._cmd_line(final_description, reviewers, similarity,
-                                find_copies, private)
+                                find_copies, private, cc)
       self.assertEquals(cmd_line, args)
       return 1, 2
     self.mock(git_cl.upload, 'RealMain', check_upload)
 
     git_cl.main(['upload'] + upload_args)
 
   def test_no_reviewer(self):
     self._run_reviewer_test(
         [],
         'desc\n\nBUG=',
@@ skipping 42 matching lines @@
     self._run_reviewer_test(
         ['-r' 'foo@example.com'],
         'desc\n\nR=foo@example.com\nBUG=',
         description.strip('\n'),
         description,
         ['--reviewers=reviewer@example.com'])
 
   def test_reviewer_multiple(self):
     # Handles multiple R= or TBR= lines.
     description = (
-        'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com')
+        'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
+        'CC=more@example.com,people@example.com')
     self._run_reviewer_test(
         [],
         'desc\n\nBUG=',
         description,
         description,
-        ['--reviewers=another@example.com,reviewer@example.com'])
+        ['--reviewers=another@example.com,reviewer@example.com'],
+        cc=['more@example.com', 'people@example.com'])
 
   def test_reviewer_send_mail(self):
     # --send-mail can be used without -r if R= is used
     description = 'Foo Bar\nR=reviewer@example.com'
     self._run_reviewer_test(
         ['--send-mail'],
         'desc\n\nBUG=',
         description.strip('\n'),
         description,
         ['--reviewers=reviewer@example.com', '--send_mail'])
@@ skipping 105 matching lines @@
            'diff', '--no-ext-diff', '--stat', '--find-copies-harder',
            '-l100000', '-C50', 'fake_ancestor_sha', 'HEAD'],),
          '+dat'),
       ]
 
   @classmethod
   def _gerrit_upload_calls(cls, description, reviewers, squash,
                            squash_mode='default',
                            expected_upstream_ref='origin/refs/heads/master',
                            ref_suffix='', notify=False,
-                           post_amend_description=None, issue=None):
+                           post_amend_description=None, issue=None, cc=None):
     if post_amend_description is None:
       post_amend_description = description
     calls = []
+    cc = cc or []
 
     if squash_mode == 'default':
       calls.extend([
         ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
         ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
       ])
     elif squash_mode in ('override_squash', 'override_nosquash'):
       calls.extend([
         ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
          'true' if squash_mode == 'override_squash' else 'false'),
@@ skipping 84 matching lines @@
            ''),
           ((['git', 'config', 'branch.master.gerritserver',
              'https://chromium-review.googlesource.com'],), ''),
           ((['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],), ''),
+          ['joe@example.com'] + cc, False],), ''),
     ]
     calls += cls._git_post_upload_calls()
     return calls
 
   def _run_gerrit_upload_test(
       self,
       upload_args,
       description,
       reviewers=None,
       squash=True,
       squash_mode=None,
       expected_upstream_ref='origin/refs/heads/master',
       ref_suffix='',
       notify=False,
       post_amend_description=None,
-      issue=None):
+      issue=None,
+      cc=None):
     """Generic gerrit upload test framework."""
     if squash_mode is None:
       if '--no-squash' in upload_args:
         squash_mode = 'nosquash'
       elif '--squash' in upload_args:
         squash_mode = 'squash'
       else:
         squash_mode = 'default'
 
     reviewers = reviewers or []
+    cc = cc or []
     self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
     self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
               CookiesAuthenticatorMockFactory(same_cookie='same_cred'))
     self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
               lambda _, offer_removal: None)
     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(
         description, reviewers, squash,
         squash_mode=squash_mode,
         expected_upstream_ref=expected_upstream_ref,
         ref_suffix=ref_suffix, notify=notify,
         post_amend_description=post_amend_description,
-        issue=issue)
+        issue=issue, cc=cc)
     # Uncomment when debugging.
     # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
     git_cl.main(['upload'] + upload_args)
 
   def test_gerrit_upload_without_change_id(self):
     self._run_gerrit_upload_test(
         ['--no-squash'],
         'desc\n\nBUG=\n',
         [],
         squash=False,
@@ skipping 35 matching lines @@
         ['-r', 'foo@example.com', '--send-mail'],
         'desc\n\nBUG=\n\nChange-Id: I123456789',
         ['foo@example.com'],
         squash=False,
         squash_mode='override_nosquash',
         notify=True)
 
   def test_gerrit_reviewer_multiple(self):
     self._run_gerrit_upload_test(
         [],
-        'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n\n'
+        'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
+        'CC=more@example.com,people@example.com\n\n'
         'Change-Id: 123456789\n',
         ['reviewer@example.com', 'another@example.com'],
         squash=False,
         squash_mode='override_nosquash',
-        ref_suffix='%l=Code-Review+1')
+        ref_suffix='%l=Code-Review+1',
+        cc=['more@example.com', 'people@example.com'])
 
   def test_gerrit_upload_squash_first_is_default(self):
     # Mock Gerrit CL description to indicate the first upload.
     self.mock(git_cl.Changelist, 'GetDescription',
               lambda *_: None)
     self._run_gerrit_upload_test(
         [],
         'desc\nBUG=\n\nChange-Id: 123456789',
         [],
         expected_upstream_ref='origin/master')
@@ skipping 1120 matching lines @@
     self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
     self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
     self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
     self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
 
 
 if __name__ == '__main__':
   git_cl.logging.basicConfig(
       level=git_cl.logging.DEBUG if '-v' in sys.argv else git_cl.logging.ERROR)
   unittest.main()