git cl: stop downloading Gerrit commit-hook with --squash mode.

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 564 matching lines @@
          'foo'),
         ((['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'):
+                           expected_upstream_ref='origin/refs/heads/master',
+                           post_amend_description=None):
+    if post_amend_description is None:
+      post_amend_description = description
     calls = [
         ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), 'false'),
         ((['git', 'log', '--pretty=format:%s\n\n%b',
            'fake_ancestor_sha..HEAD'],),
          description)
         ]
     if not git_footers.get_footer_change_id(description) and not squash:
+      # TODOOOOO
       calls += [
+          # DownloadGerritHook(False)
+          ((False, ),
+            ''),
+          # Amending of commit message to get the Change-Id.
           ((['git', 'log', '--pretty=format:%s\n\n%b',
              'fake_ancestor_sha..HEAD'],),
            description),
           ((['git', 'commit', '--amend', '-m', description],),
            ''),
           ((['git', 'log', '--pretty=format:%s\n\n%b',
              'fake_ancestor_sha..HEAD'],),
-           description)
+           post_amend_description)
           ]
     if squash:
       ref_to_push = 'abcdef0123456789'
       calls += [
           ((['git', 'show', '--format=%B', '-s',
             'refs/heads/git_cl_uploads/master'],),
            (description, 0)),
           ((['git', 'config', 'branch.master.merge'],),
            'refs/heads/master'),
           ((['git', 'config', 'branch.master.remote'],),
@@ skipping 36 matching lines @@
           ]
     calls += cls._git_post_upload_calls()
     return calls
 
   def _run_gerrit_upload_test(
       self,
       upload_args,
       description,
       reviewers,
       squash=False,
-      expected_upstream_ref='origin/refs/heads/master'):
+      expected_upstream_ref='origin/refs/heads/master',
+      post_amend_description=None):
     """Generic gerrit upload test framework."""
     self.calls = self._gerrit_base_calls()
     self.calls += self._gerrit_upload_calls(
         description, reviewers, squash,
-        expected_upstream_ref=expected_upstream_ref)
+        expected_upstream_ref=expected_upstream_ref,
+        post_amend_description=post_amend_description)
     # 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_reviewers_cmd_line(self):
     self._run_gerrit_upload_test(
         ['-r', 'foo@example.com'],
@@ skipping 128 matching lines @@
            'rietveld.force-https-commit-url'],), ''),
         ((['git', 'config', '--unset-all',
            'rietveld.cpplint-ignore-regex'],), ''),
         ((['git', 'config', '--unset-all',
            'rietveld.project'],), ''),
         ((['git', 'config', '--unset-all',
            'rietveld.pending-ref-prefix'],), ''),
         ((['git', 'config', '--unset-all',
            'rietveld.run-post-upload-hook'],), ''),
         ((['git', 'config', 'gerrit.host', 'True'],), ''),
-        # DownloadHooks(False)
-        ((['git', 'config', 'gerrit.host'],), 'True'),
-        ((['git', 'rev-parse', '--show-cdup'],), ''),
-        ((commit_msg_path, os.X_OK,), False),
-        (('https://gerrit-review.googlesource.com/tools/hooks/commit-msg',
-          commit_msg_path,), ''),
-        ((commit_msg_path,), True),
-        ((commit_msg_path, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR,), ''),
         # GetCodereviewSettingsInteractively
         ((['git', 'config', 'rietveld.server'],),
          'gerrit.chromium.org'),
         (('Rietveld server (host[:port]) [https://gerrit.chromium.org]:',),
          ''),
         ((['git', 'config', 'rietveld.cc'],), ''),
         (('CC list:',), ''),
         ((['git', 'config', 'rietveld.private'],), ''),
         (('Private flag (rietveld only):',), ''),
         ((['git', 'config', 'rietveld.tree-status-url'],), ''),
         (('Tree status URL:',), ''),
         ((['git', 'config', 'rietveld.viewvc-url'],), ''),
         (('ViewVC URL:',), ''),
-        # DownloadHooks(True)
         ((['git', 'config', 'rietveld.bug-prefix'],), ''),
         (('Bug Prefix:',), ''),
         ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
         (('Run Post Upload Hook:',), ''),
-        ((commit_msg_path, os.X_OK,), True),
+        # DownloadGerritHook(False)
+        ((['git', 'config', 'gerrit.host'],), 'True'),
+        ((['git', 'rev-parse', '--show-cdup'],), ''),
+        ((commit_msg_path, os.X_OK,), False),
+        (('https://gerrit-review.googlesource.com/tools/hooks/commit-msg',
+          commit_msg_path,), ''),
+        ((commit_msg_path,), True),
+        ((commit_msg_path, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR,), ''),
         ]
     git_cl.main(['config'])
 
   def test_update_reviewers(self):
     data = [
       ('foo', [], 'foo'),
       ('foo\nR=xx', [], 'foo\nR=xx'),
       ('foo\nTBR=xx', [], 'foo\nTBR=xx'),
       ('foo', ['a@c'], 'foo\n\nR=a@c'),
       ('foo\nR=xx', ['a@c'], 'foo\n\nR=a@c, xx'),
@@ skipping 115 matching lines @@
     self.calls += [
       ((['git', 'apply', '--index', '-p0', '--3way'],), '',
        subprocess2.CalledProcessError(1, '', '', '', '')),
     ]
     self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
 
 if __name__ == '__main__':
   git_cl.logging.basicConfig(
       level=git_cl.logging.DEBUG if '-v' in sys.argv else git_cl.logging.ERROR)
   unittest.main()