git cl for Gerrit: make --squash generate Change-Id directly.

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
 import sys
 import unittest
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from testing_support.auto_stub import TestCase
 
 import git_cl
 import git_common
+import git_footers
 import subprocess2
 
 class PresubmitMock(object):
   def __init__(self, *args, **kwargs):
     self.reviewers = []
   @staticmethod
   def should_continue():
     return True
 
 
@@ skipping 551 matching lines @@
 
   @classmethod
   def _gerrit_upload_calls(cls, description, reviewers, squash,
                            expected_upstream_ref='origin/refs/heads/master'):
     calls = [
         ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), 'false'),
         ((['git', 'log', '--pretty=format:%s\n\n%b',
            'fake_ancestor_sha..HEAD'],),
          description)
         ]
-    if git_cl.CHANGE_ID not in description:
+    if not git_footers.get_footer_change_id(description) and not squash:
       calls += [
           ((['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)
           ]
@@ skipping 370 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()