git cl upload for Gerit no-squash: correct detect missing Change-Id.

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 642 matching lines @@
       upload_args,
       description,
       reviewers,
       squash=False,
       expected_upstream_ref='origin/refs/heads/master'):
     """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)
+    # 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(
         [],
         'desc\n\nBUG=\n',
         [])
 
   def test_gerrit_no_reviewer(self):
     self._run_gerrit_upload_test(
         [],
-        'desc\n\nBUG=\nChange-Id:123456789\n',
+        'desc\n\nBUG=\n\nChange-Id: I123456789\n',
         [])
 
   def test_gerrit_reviewers_cmd_line(self):
     self._run_gerrit_upload_test(
         ['-r', 'foo@example.com'],
-        'desc\n\nBUG=\nChange-Id:123456789',
+        'desc\n\nBUG=\n\nChange-Id: I123456789',
         ['foo@example.com'])
 
   def test_gerrit_reviewer_multiple(self):
     self._run_gerrit_upload_test(
         [],
-        'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
-        'Change-Id:123456789\n',
+        '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(self):
     self._run_gerrit_upload_test(
         ['--squash'],
         'desc\n\nBUG=\nChange-Id:123456789\n',
         [],
         squash=True,
         expected_upstream_ref='origin/master')
 
@@ skipping 272 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()