Return unicode commit hashes in checkout.GitCheckout

tests/checkout_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 checkout.py."""
 
 import logging
 import os
 import shutil
@@ skipping 266 matching lines @@
     return data
 
   def _check_base(self, co, root, expected):
     read_only = isinstance(co, checkout.ReadOnlyCheckout)
     self.assertEquals(not read_only, bool(expected))
     self.assertEquals(read_only, self.is_read_only)
     if not read_only:
       self.FAKE_REPOS.svn_dirty = True
 
     self.assertEquals(root, co.project_path)
-    self.assertEquals(self.previous_log['revision'], co.prepare(None))
+    svn_rev = co.prepare(None)
+    self.assertEquals(int, type(svn_rev))
+    self.assertEquals(self.previous_log['revision'], svn_rev)
     self.assertEquals('pouet', co.get_settings('bar'))
     self.assertTree(self.get_trunk(False), root)
     patches = self.get_patches()
     co.apply_patch(patches)
     self.assertEquals(
         ['bin_file', 'chrome/file.cc', 'new_dir/subdir/new_file', 'extra'],
         patches.filenames)
 
     # Verify that the patch is applied even for read only checkout.
     self.assertTree(self.get_trunk(True), root)
@@ skipping 72 matching lines @@
         'msg': out.split()[-1],
     }
 
   def _check_base(self, co, root, expected):
     read_only = isinstance(co, checkout.ReadOnlyCheckout)
     self.assertEquals(read_only, self.is_read_only)
     if not read_only:
       self.FAKE_REPOS.git_dirty = True
 
     self.assertEquals(root, co.project_path)
-    self.assertEquals(self.previous_log['revision'], co.prepare(None))
+    git_rev = co.prepare(None)
+    self.assertEquals(unicode, type(git_rev))

[iannucci, 2013/10/02 18:24:36]

hmm... can't we just change the expected return type to str? Since it's actually
hex-encoded binary, I don't see any benefit to casting to unicode (unless it's
expecting to be able to get a refname, but even then, I'm pretty sure git
doesn't support unicode refs).

[rmistry, 2013/10/02 19:02:13]

We can, it will need a few changes in the CQ.
Since svn revs are expected to be ints I figured it would be ok if git revs are
expected to be unicodes, but if you prefer the other approach then that SGTM.
CL coming soon..

+    self.assertEquals(self.previous_log['revision'], git_rev)
     self.assertEquals('pouet', co.get_settings('bar'))
     self.assertTree(self.get_trunk(False), root)
     patches = self.get_patches()
     co.apply_patch(patches)
     self.assertEquals(
         ['bin_file', 'chrome/file.cc', 'new_dir/subdir/new_file', 'extra'],
         patches.filenames)
 
     # Hackish to verify _branches() internal function.
     # pylint: disable=W0212
@@ skipping 333 matching lines @@
   if '-v' in sys.argv:
     DEBUGGING = True
     logging.basicConfig(
         level=logging.DEBUG,
         format='%(levelname)5s %(filename)15s(%(lineno)3d): %(message)s')
   else:
     logging.basicConfig(
         level=logging.ERROR,
         format='%(levelname)5s %(filename)15s(%(lineno)3d): %(message)s')
   unittest.main()