Gerrit git cl upload: obey -s --send-mail option.

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 os
 import StringIO
 import stat
@@ skipping 740 matching lines @@
         ((['git', 'config', 'user.email'],), 'me@example.com'),
         ((['git',
            'diff', '--no-ext-diff', '--stat', '--find-copies-harder',
            '-l100000', '-C50', 'fake_ancestor_sha', 'HEAD'],),
          '+dat'),
       ]
 
   @classmethod
   def _gerrit_upload_calls(cls, description, reviewers, squash,
                            expected_upstream_ref='origin/refs/heads/master',
-                           ref_suffix='',
+                           ref_suffix='', notify=False,
                            post_amend_description=None, issue=None):
     if post_amend_description is None:
       post_amend_description = description
 
     calls = [
         ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), 'false'),
     ]
     # If issue is given, then description is fetched from Gerrit instead.
     if issue is None:
       if squash:
@@ skipping 48 matching lines @@
         ((['git', 'rev-list',
             expected_upstream_ref + '..' + ref_to_push],), ''),
         ((['git', 'config', 'rietveld.cc'],), '')
         ]
     # Add cc from watch list.
     # TODO(tandrii): bring this back after http://crbug.com/604377.
     # if ref_suffix == '':
     #   ref_suffix = '%cc=joe@example.com'
     # else:
     #   ref_suffix += ',cc=joe@example.com'
+
+    notify_suffix = 'notify=%s' % ('ALL' if notify else 'NONE')
+    if ref_suffix:
+      ref_suffix += ',' + notify_suffix
+    else:
+      ref_suffix = '%' + notify_suffix
     if reviewers:
-      if ref_suffix:
-        ref_suffix += ','
-      else:
-        ref_suffix = '%'
-      ref_suffix += ','.join('r=%s' % email for email in sorted(reviewers))
+      ref_suffix += ',' + ','.join('r=%s' % email
+                                   for email in sorted(reviewers))
     calls += [
         ((['git', 'push', 'origin',
            ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
          ('remote:\n'
          'remote: Processing changes: (\)\n'
          'remote: Processing changes: (|)\n'
          'remote: Processing changes: (/)\n'
          'remote: Processing changes: (-)\n'
          'remote: Processing changes: new: 1 (/)\n'
          'remote: Processing changes: new: 1, done\n'
@@ skipping 16 matching lines @@
     return calls
 
   def _run_gerrit_upload_test(
       self,
       upload_args,
       description,
       reviewers=None,
       squash=False,
       expected_upstream_ref='origin/refs/heads/master',
       ref_suffix='',
+      notify=False,
       post_amend_description=None,
       issue=None):
     """Generic gerrit upload test framework."""
     reviewers = reviewers or []
     self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
     self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
               CookiesAuthenticatorMockFactory(same_cookie='same_cred'))
     self.calls = self._gerrit_base_calls(issue=issue)
     self.calls += self._gerrit_upload_calls(
         description, reviewers, squash,
         expected_upstream_ref=expected_upstream_ref,
-        ref_suffix=ref_suffix,
+        ref_suffix=ref_suffix, notify=notify,
         post_amend_description=post_amend_description,
         issue=issue)
     # 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.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
     self._run_gerrit_upload_test(
         [],
         'desc\n\nBUG=\n',
         [],
         post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
 
   def test_gerrit_no_reviewer(self):
     self._run_gerrit_upload_test(
         [],
         'desc\n\nBUG=\n\nChange-Id: I123456789\n',
         [])
 
   def test_gerrit_patch_title(self):
     self._run_gerrit_upload_test(
         ['-t', 'Don\'t put under_scores as they become spaces'],
         'desc\n\nBUG=\n\nChange-Id: I123456789',
         ref_suffix='%m=Don\'t_put_under_scores_as_they_become_spaces')
 
   def test_gerrit_reviewers_cmd_line(self):
     self._run_gerrit_upload_test(
-        ['-r', 'foo@example.com'],
+        ['-r', 'foo@example.com', '--send-mail'],
         'desc\n\nBUG=\n\nChange-Id: I123456789',
-        ['foo@example.com'])
+        ['foo@example.com'],
+        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'
         'Change-Id: 123456789\n',
         ['reviewer@example.com', 'another@example.com'])
 
   def test_gerrit_upload_squash_first(self):
     # Mock Gerrit CL description to indicate the first upload.
@@ skipping 522 matching lines @@
     self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
 
     self.assertEqual(0, git_cl.main(['description', '-n', '-']))
     self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
 
 
 if __name__ == '__main__':
   git_cl.logging.basicConfig(
       level=git_cl.logging.DEBUG if '-v' in sys.argv else git_cl.logging.ERROR)
   unittest.main()