Fix unpinned version to track upstream.

tests/gclient_scm_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 gclient_scm.py."""
 
 # pylint: disable=E1103
 
 # Import before super_mox to keep valid references.
@@ skipping 782 matching lines @@
     self.relpath = '.'
     self.base_path = join(self.root_dir, self.relpath)
     self.enabled = self.CreateGitRepo(self.sample_git_import, self.base_path)
     StdoutCheck.setUp(self)
     self._original_GitBinaryExists = gclient_scm.GitWrapper.BinaryExists
     self._original_SVNBinaryExists = gclient_scm.SVNWrapper.BinaryExists
     gclient_scm.GitWrapper.BinaryExists = staticmethod(lambda : True)
     gclient_scm.SVNWrapper.BinaryExists = staticmethod(lambda : True)
 
   def tearDown(self):
-    StdoutCheck.tearDown(self)
-    TestCaseUtils.tearDown(self)
-    unittest.TestCase.tearDown(self)
-    rmtree(self.root_dir)
-    gclient_scm.GitWrapper.BinaryExists = self._original_GitBinaryExists
-    gclient_scm.SVNWrapper.BinaryExists = self._original_SVNBinaryExists
+    try:
+      rmtree(self.root_dir)
+      StdoutCheck.tearDown(self)
+      TestCaseUtils.tearDown(self)
+      unittest.TestCase.tearDown(self)
+    finally:
+      # TODO(maruel): Use auto_stub.TestCase.
+      gclient_scm.GitWrapper.BinaryExists = self._original_GitBinaryExists
+      gclient_scm.SVNWrapper.BinaryExists = self._original_SVNBinaryExists
+
 
 class ManagedGitWrapperTestCase(BaseGitWrapperTestCase):
   def testDir(self):
     members = [
         'BinaryExists',
         'FullUrlForRelativeUrl',
         'GetCheckoutRoot',
         'GetRevisionDate',
         'GetUsableRev',
         'RunCommand',
         'cache_dir',
         'cache_locks',
         'cleanup',
         'diff',
         'name',
         'pack',
         'UpdateSubmoduleConfig',
         'relpath',
+        'remote',
         'revert',
         'revinfo',
         'runhooks',
         'status',
         'update',
         'url',
     ]
 
     # If you add a member, be sure to add the relevant test!
     self.compareMembers(gclient_scm.CreateSCM(url=self.url), members)
@@ skipping 195 matching lines @@
     scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir,
                                 relpath=self.relpath)
     file_path = join(self.base_path, 'b')
     open(file_path, 'w').writelines('conflict\n')
     scm._Run(['commit', '-am', 'test'], options)
     __builtin__.raw_input = lambda x: 'y'
     exception = ('Conflict while rebasing this branch.\n'
                  'Fix the conflict and run gclient again.\n'
                  'See \'man git-rebase\' for details.\n')
     self.assertRaisesError(exception, scm.update, options, (), [])
-    exception = ('\n____ . at refs/heads/master\n'
+    exception = ('\n____ . at refs/remotes/origin/master\n'
                  '\tYou have unstaged changes.\n'
                  '\tPlease commit, stash, or reset.\n')
     self.assertRaisesError(exception, scm.update, options, (), [])
     sys.stdout.close()
 
   def testRevinfo(self):
     if not self.enabled:
       return
     options = self.Options()
     scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir,
@@ skipping 147 matching lines @@
 
 if __name__ == '__main__':
   if '-v' in sys.argv:
     logging.basicConfig(
         level=logging.DEBUG,
         format='%(asctime).19s %(levelname)s %(filename)s:'
                '%(lineno)s %(message)s')
   unittest.main()
 
 # vim: ts=2:sw=2:tw=80:et: