Fix gclient_scm_test that was broken in r61459.

tests/gclient_scm_test.py

 #!/usr/bin/python
 # Copyright (c) 2010 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."""
 
 # Import before super_mox to keep valid references.
 from os import rename
 from shutil import rmtree
 import StringIO
 from subprocess import Popen, PIPE, STDOUT
 import tempfile
 import unittest
 import __builtin__
 
 # Fixes include path.
 from super_mox import mox, StdoutCheck, TestCaseUtils, SuperMoxTestBase
 
 import gclient_scm
 
+# Shortcut since this function is used often
+join = gclient_scm.os.path.join
+
 
 class GCBaseTestCase(object):
   def assertRaisesError(self, msg, fn, *args, **kwargs):
     """Like unittest's assertRaises() but checks for Gclient.Error."""
     try:
       fn(*args, **kwargs)
     except gclient_scm.gclient_utils.Error, e:
       self.assertEquals(e.args[0], msg)
     else:
       self.fail('%s not raised' % msg)
@@ skipping 10 matching lines @@
     self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'FileWrite')
     self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'Popen')
     self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'RemoveDirectory')
     self._CaptureSVNInfo = gclient_scm.scm.SVN.CaptureInfo
     self.mox.StubOutWithMock(gclient_scm.scm.SVN, 'Capture')
     self.mox.StubOutWithMock(gclient_scm.scm.SVN, 'CaptureInfo')
     self.mox.StubOutWithMock(gclient_scm.scm.SVN, 'CaptureStatus')
     self.mox.StubOutWithMock(gclient_scm.scm.SVN, 'RunAndGetFileList')
     self._scm_wrapper = gclient_scm.CreateSCM
     gclient_scm.scm.SVN.current_version = None
+    # Absolute path of the fake checkout directory.
+    self.base_path = join(self.root_dir, self.relpath)
 
   def tearDown(self):
     SuperMoxTestBase.tearDown(self)
 
 
 class SVNWrapperTestCase(BaseTestCase):
   class OptionsObject(object):
      def __init__(self, verbose=False, revision=None):
       self.verbose = verbose
       self.revision = revision
@@ skipping 37 matching lines @@
   def testGITFullUrlForRelativeUrl(self):
     self.url = 'git://a/b/c/d'
 
     self.mox.ReplayAll()
     scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
                             relpath=self.relpath)
     self.assertEqual(scm.FullUrlForRelativeUrl('/crap'), 'git://a/b/c/crap')
 
   def testRunCommandException(self):
     options = self.Options(verbose=False)
-    file_path = gclient_scm.os.path.join(self.root_dir, self.relpath, '.git')
-    gclient_scm.os.path.exists(file_path).AndReturn(False)
+    gclient_scm.os.path.exists(join(self.base_path, '.git')).AndReturn(False)
+    gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(False)
 
     self.mox.ReplayAll()
     scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
                             relpath=self.relpath)
     exception = "Unsupported argument(s): %s" % ','.join(self.args)
     self.assertRaisesError(exception, scm.RunCommand,
                            'update', options, self.args)
 
   def testRunCommandUnknown(self):
     # TODO(maruel): if ever used.
     pass
 
   def testRevertMissing(self):
     options = self.Options(verbose=True)
-    base_path = gclient_scm.os.path.join(self.root_dir, self.relpath)
-    gclient_scm.os.path.isdir(base_path).AndReturn(False)
+    gclient_scm.os.path.isdir(self.base_path).AndReturn(False)
     gclient_scm.scm.SVN.Capture(['--version']
         ).AndReturn('svn, version 1.5.1 (r32289)')
     # It'll to a checkout instead.
-    gclient_scm.os.path.exists(gclient_scm.os.path.join(base_path, '.git')
-                               ).AndReturn(False)
+    gclient_scm.os.path.exists(join(self.base_path, '.git')).AndReturn(False)
+    gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(False)
     # Checkout.
-    gclient_scm.os.path.exists(base_path).AndReturn(False)
+    gclient_scm.os.path.exists(self.base_path).AndReturn(False)
     files_list = self.mox.CreateMockAnything()
     gclient_scm.scm.SVN.RunAndGetFileList(options.verbose,
-                                          ['checkout', self.url, base_path,
+                                          ['checkout', self.url, self.base_path,
                                            '--force'],
                                           cwd=self.root_dir,
                                           file_list=files_list)
 
     self.mox.ReplayAll()
     scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
                             relpath=self.relpath)
     scm.revert(options, self.args, files_list)
     self.checkstdout(
         ('\n_____ %s is missing, synching instead\n' % self.relpath))
 
   def testRevertNone(self):
     options = self.Options(verbose=True)
-    base_path = gclient_scm.os.path.join(self.root_dir, self.relpath)
-    gclient_scm.os.path.isdir(base_path).AndReturn(True)
-    gclient_scm.scm.SVN.CaptureStatus(base_path).AndReturn([])
+    gclient_scm.os.path.isdir(self.base_path).AndReturn(True)
+    gclient_scm.scm.SVN.CaptureStatus(self.base_path).AndReturn([])
     gclient_scm.scm.SVN.RunAndGetFileList(options.verbose,
                                           ['update', '--revision', 'BASE'],
-                                          cwd=base_path,
+                                          cwd=self.base_path,
                                           file_list=mox.IgnoreArg())
 
     self.mox.ReplayAll()
     scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
                             relpath=self.relpath)
     file_list = []
     scm.revert(options, self.args, file_list)
 
   def testRevert2Files(self):
     options = self.Options(verbose=True)
-    base_path = gclient_scm.os.path.join(self.root_dir, self.relpath)
-    gclient_scm.os.path.isdir(base_path).AndReturn(True)
+    gclient_scm.os.path.isdir(self.base_path).AndReturn(True)
     items = [
       ('M      ', 'a'),
       ('A      ', 'b'),
     ]
-    file_path1 = gclient_scm.os.path.join(base_path, 'a')
-    file_path2 = gclient_scm.os.path.join(base_path, 'b')
-    gclient_scm.scm.SVN.CaptureStatus(base_path).AndReturn(items)
+    file_path1 = join(self.base_path, 'a')
+    file_path2 = join(self.base_path, 'b')
+    gclient_scm.scm.SVN.CaptureStatus(self.base_path).AndReturn(items)
     gclient_scm.os.path.exists(file_path1).AndReturn(True)
     gclient_scm.os.path.isfile(file_path1).AndReturn(True)
     gclient_scm.os.remove(file_path1)
     gclient_scm.os.path.exists(file_path2).AndReturn(True)
     gclient_scm.os.path.isfile(file_path2).AndReturn(True)
     gclient_scm.os.remove(file_path2)
     gclient_scm.scm.SVN.RunAndGetFileList(options.verbose,
                                           ['update', '--revision', 'BASE'],
-                                          cwd=base_path,
+                                          cwd=self.base_path,
                                           file_list=mox.IgnoreArg())
 
     self.mox.ReplayAll()
     scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
                             relpath=self.relpath)
     file_list = []
     scm.revert(options, self.args, file_list)
     self.checkstdout(
-        ('%s\n%s\n' % (gclient_scm.os.path.join(base_path, 'a'),
-            gclient_scm.os.path.join(base_path, 'b'))))
+        ('%s\n%s\n' % (join(self.base_path, 'a'),
+            join(self.base_path, 'b'))))
 
   def testRevertDirectory(self):
     options = self.Options(verbose=True)
-    base_path = gclient_scm.os.path.join(self.root_dir, self.relpath)
-    gclient_scm.os.path.isdir(base_path).AndReturn(True)
+    gclient_scm.os.path.isdir(self.base_path).AndReturn(True)
     items = [
       ('~      ', 'a'),
     ]
-    gclient_scm.scm.SVN.CaptureStatus(base_path).AndReturn(items)
-    file_path = gclient_scm.os.path.join(base_path, 'a')
+    gclient_scm.scm.SVN.CaptureStatus(self.base_path).AndReturn(items)
+    file_path = join(self.base_path, 'a')
     gclient_scm.os.path.exists(file_path).AndReturn(True)
     gclient_scm.os.path.isfile(file_path).AndReturn(False)
     gclient_scm.os.path.islink(file_path).AndReturn(False)
     gclient_scm.os.path.isdir(file_path).AndReturn(True)
     gclient_scm.gclient_utils.RemoveDirectory(file_path)
     file_list1 = []
     gclient_scm.scm.SVN.RunAndGetFileList(options.verbose,
                                           ['update', '--revision', 'BASE'],
-                                          cwd=base_path,
+                                          cwd=self.base_path,
                                           file_list=mox.IgnoreArg())
 
     self.mox.ReplayAll()
     scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
                             relpath=self.relpath)
     file_list2 = []
     scm.revert(options, self.args, file_list2)
     self.checkstdout(('%s\n' % file_path))
 
   def testStatus(self):
     options = self.Options(verbose=True)
-    base_path = gclient_scm.os.path.join(self.root_dir, self.relpath)
-    gclient_scm.os.path.isdir(base_path).AndReturn(True)
+    gclient_scm.os.path.isdir(self.base_path).AndReturn(True)
     gclient_scm.scm.SVN.RunAndGetFileList(
         options.verbose, ['status'] + self.args,
-        cwd=base_path, file_list=[]).AndReturn(None)
+        cwd=self.base_path, file_list=[]).AndReturn(None)
 
     self.mox.ReplayAll()
     scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
                             relpath=self.relpath)
     file_list = []
     self.assertEqual(scm.status(options, self.args, file_list), None)
 
   # TODO(maruel):  TEST REVISIONS!!!
   # TODO(maruel):  TEST RELOCATE!!!
   def testUpdateCheckout(self):
     options = self.Options(verbose=True)
-    base_path = gclient_scm.os.path.join(self.root_dir, self.relpath)
     file_info = gclient_scm.gclient_utils.PrintableObject()
     file_info.root = 'blah'
     file_info.url = self.url
     file_info.uuid = 'ABC'
     file_info.revision = 42
-    gclient_scm.os.path.exists(gclient_scm.os.path.join(base_path, '.git')
-                               ).AndReturn(False)
+    gclient_scm.os.path.exists(join(self.base_path, '.git')).AndReturn(False)
+    gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(False)
     # Checkout.
-    gclient_scm.os.path.exists(base_path).AndReturn(False)
+    gclient_scm.os.path.exists(self.base_path).AndReturn(False)
     files_list = self.mox.CreateMockAnything()
     gclient_scm.scm.SVN.Capture(['--version']
         ).AndReturn('svn, version 1.5.1 (r32289)')
     gclient_scm.scm.SVN.RunAndGetFileList(options.verbose,
-                                          ['checkout', self.url, base_path,
+                                          ['checkout', self.url, self.base_path,
                                            '--force'],
                                           cwd=self.root_dir,
                                           file_list=files_list)
     self.mox.ReplayAll()
     scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
                             relpath=self.relpath)
     scm.update(options, (), files_list)
 
   def testUpdateUpdate(self):
     options = self.Options(verbose=True)
-    base_path = gclient_scm.os.path.join(self.root_dir, self.relpath)
     options.force = True
     options.nohooks = False
     file_info = {
       'Repository Root': 'blah',
       'URL': self.url,
       'UUID': 'ABC',
       'Revision': 42,
     }
-    gclient_scm.os.path.exists(gclient_scm.os.path.join(base_path, '.git')
-                               ).AndReturn(False)
+    gclient_scm.os.path.exists(join(self.base_path, '.git')).AndReturn(False)
+    gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(False)
 
     # Verify no locked files.
-    gclient_scm.scm.SVN.CaptureStatus(gclient_scm.os.path.join(base_path, '.')
-        ).AndReturn([])
+    dotted_path = join(self.base_path, '.')
+    gclient_scm.scm.SVN.CaptureStatus(dotted_path).AndReturn([])
 
     # Checkout or update.
-    gclient_scm.os.path.exists(base_path).AndReturn(True)
-    gclient_scm.scm.SVN.CaptureInfo(
-        gclient_scm.os.path.join(base_path, ".")).AndReturn(file_info)
+    gclient_scm.os.path.exists(self.base_path).AndReturn(True)
+    gclient_scm.scm.SVN.CaptureInfo(dotted_path).AndReturn(file_info)
     # Cheat a bit here.
     gclient_scm.scm.SVN.CaptureInfo(file_info['URL']).AndReturn(file_info)
     additional_args = []
     if options.manually_grab_svn_rev:
       additional_args = ['--revision', str(file_info['Revision'])]
     gclient_scm.scm.SVN.Capture(['--version']
         ).AndReturn('svn, version 1.5.1 (r32289)')
     additional_args.append('--force')
     files_list = []
     gclient_scm.scm.SVN.RunAndGetFileList(
         options.verbose,
-        ['update', base_path] + additional_args,
+        ['update', self.base_path] + additional_args,
         cwd=self.root_dir, file_list=files_list)
 
     self.mox.ReplayAll()
     scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
                             relpath=self.relpath)
     scm.update(options, (), files_list)
 
   def testUpdateSingleCheckout(self):
     options = self.Options(verbose=True)
-    base_path = gclient_scm.os.path.join(self.root_dir, self.relpath)
     file_info = {
       'URL': self.url,
       'Revision': 42,
     }
 
     # Checks to make sure that we support svn co --depth.
     gclient_scm.scm.SVN.current_version = None
     gclient_scm.scm.SVN.Capture(['--version']
         ).AndReturn('svn, version 1.5.1 (r32289)')
-    gclient_scm.os.path.exists(gclient_scm.os.path.join(base_path, '.svn')
-        ).AndReturn(False)
-    gclient_scm.os.path.exists(gclient_scm.os.path.join(base_path, 'DEPS')
-        ).AndReturn(False)
+    gclient_scm.os.path.exists(join(self.base_path, '.svn')).AndReturn(False)
+    gclient_scm.os.path.exists(join(self.base_path, 'DEPS')).AndReturn(False)
 
     # Verify no locked files.
-    gclient_scm.scm.SVN.CaptureStatus(gclient_scm.os.path.join(base_path, '.')
-        ).AndReturn([])
+    dotted_path = join(self.base_path, '.')
+    gclient_scm.scm.SVN.CaptureStatus(dotted_path).AndReturn([])
 
     # When checking out a single file, we issue an svn checkout and svn update.
     files_list = self.mox.CreateMockAnything()
     gclient_scm.gclient_utils.CheckCallAndFilterAndHeader(
-        ['svn', 'checkout', '--depth', 'empty', self.url, base_path],
+        ['svn', 'checkout', '--depth', 'empty', self.url, self.base_path],
         always=True, cwd=self.root_dir)
     gclient_scm.scm.SVN.RunAndGetFileList(options.verbose, ['update', 'DEPS'],
-        cwd=base_path, file_list=files_list)
+        cwd=self.base_path, file_list=files_list)
 
     # Now we fall back on scm.update().
-    gclient_scm.os.path.exists(gclient_scm.os.path.join(base_path, '.git')
-        ).AndReturn(False)
-    gclient_scm.os.path.exists(base_path).AndReturn(True)
-    gclient_scm.scm.SVN.CaptureInfo(
-        gclient_scm.os.path.join(base_path, ".")).AndReturn(file_info)
+    gclient_scm.os.path.exists(join(self.base_path, '.git')).AndReturn(False)
+    gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(False)
+    gclient_scm.os.path.exists(self.base_path).AndReturn(True)
+    gclient_scm.scm.SVN.CaptureInfo(dotted_path).AndReturn(file_info)
     gclient_scm.scm.SVN.CaptureInfo(file_info['URL']).AndReturn(file_info)
 
     self.mox.ReplayAll()
     scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
                             relpath=self.relpath)
     scm.updatesingle(options, ['DEPS'], files_list)
     self.checkstdout('\n_____ %s at 42\n' % self.relpath)
 
   def testUpdateSingleCheckoutSVN14(self):
     options = self.Options(verbose=True)
-    base_path = gclient_scm.os.path.join(self.root_dir, self.relpath)
     file_info = {
       'URL': self.url,
       'Revision': 42,
     }
 
     # Checks to make sure that we support svn co --depth.
     gclient_scm.scm.SVN.current_version = None
     gclient_scm.scm.SVN.Capture(['--version']
         ).AndReturn('svn, version 1.4.4 (r25188)')
-    gclient_scm.os.path.exists(gclient_scm.os.path.join(base_path)
-        ).AndReturn(True)
+    gclient_scm.os.path.exists(self.base_path).AndReturn(True)
 
     # When checking out a single file with svn 1.4, we use svn export
     files_list = self.mox.CreateMockAnything()
     gclient_scm.gclient_utils.CheckCallAndFilterAndHeader(
-        ['svn', 'export', gclient_scm.os.path.join(self.url, 'DEPS'),
-            gclient_scm.os.path.join(base_path, 'DEPS')],
+        ['svn', 'export', join(self.url, 'DEPS'), join(self.base_path, 'DEPS')],
         always=True, cwd=self.root_dir)
 
     self.mox.ReplayAll()
     scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
                             relpath=self.relpath)
     scm.updatesingle(options, ['DEPS'], files_list)
 
   def testUpdateSingleCheckoutSVNUpgrade(self):
     options = self.Options(verbose=True)
-    base_path = gclient_scm.os.path.join(self.root_dir, self.relpath)
     file_info = {
       'URL': self.url,
       'Revision': 42,
     }
 
     # Checks to make sure that we support svn co --depth.
     gclient_scm.scm.SVN.current_version = None
     gclient_scm.scm.SVN.Capture(['--version']
         ).AndReturn('svn, version 1.5.1 (r32289)')
-    gclient_scm.os.path.exists(gclient_scm.os.path.join(base_path, '.svn')
-        ).AndReturn(False)
+    gclient_scm.os.path.exists(join(self.base_path, '.svn')).AndReturn(False)
     # If DEPS already exists, assume we're upgrading from svn1.4, so delete
     # the old DEPS file.
-    gclient_scm.os.path.exists(gclient_scm.os.path.join(base_path, 'DEPS')
-        ).AndReturn(True)
-    gclient_scm.os.remove(gclient_scm.os.path.join(base_path, 'DEPS'))
+    gclient_scm.os.path.exists(join(self.base_path, 'DEPS')).AndReturn(True)
+    gclient_scm.os.remove(join(self.base_path, 'DEPS'))
 
     # Verify no locked files.
-    gclient_scm.scm.SVN.CaptureStatus(gclient_scm.os.path.join(base_path, '.')
-        ).AndReturn([])
+    gclient_scm.scm.SVN.CaptureStatus(join(self.base_path, '.')).AndReturn([])
 
     # When checking out a single file, we issue an svn checkout and svn update.
     files_list = self.mox.CreateMockAnything()
     gclient_scm.gclient_utils.CheckCallAndFilterAndHeader(
-        ['svn', 'checkout', '--depth', 'empty', self.url, base_path],
+        ['svn', 'checkout', '--depth', 'empty', self.url, self.base_path],
         always=True, cwd=self.root_dir)
     gclient_scm.scm.SVN.RunAndGetFileList(options.verbose, ['update', 'DEPS'],
-        cwd=base_path, file_list=files_list)
+        cwd=self.base_path, file_list=files_list)
 
     # Now we fall back on scm.update().
-    gclient_scm.os.path.exists(gclient_scm.os.path.join(base_path, '.git')
-        ).AndReturn(False)
-    gclient_scm.os.path.exists(base_path).AndReturn(True)
+    gclient_scm.os.path.exists(join(self.base_path, '.git')).AndReturn(False)
+    gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(False)
+    gclient_scm.os.path.exists(self.base_path).AndReturn(True)
     gclient_scm.scm.SVN.CaptureInfo(
-        gclient_scm.os.path.join(base_path, ".")).AndReturn(file_info)
+        join(self.base_path, ".")).AndReturn(file_info)
     gclient_scm.scm.SVN.CaptureInfo(file_info['URL']).AndReturn(file_info)
 
     self.mox.ReplayAll()
     scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
                             relpath=self.relpath)
     scm.updatesingle(options, ['DEPS'], files_list)
     self.checkstdout(
         ('\n_____ %s at 42\n' % self.relpath))
 
   def testUpdateSingleUpdate(self):
     options = self.Options(verbose=True)
-    base_path = gclient_scm.os.path.join(self.root_dir, self.relpath)
     file_info = {
       'URL': self.url,
       'Revision': 42,
     }
     # Checks to make sure that we support svn co --depth.
     gclient_scm.scm.SVN.current_version = None
     gclient_scm.scm.SVN.Capture(['--version']
         ).AndReturn('svn, version 1.5.1 (r32289)')
-    gclient_scm.os.path.exists(gclient_scm.os.path.join(base_path, '.svn')
-        ).AndReturn(True)
+    gclient_scm.os.path.exists(join(self.base_path, '.svn')).AndReturn(True)
 
     # Verify no locked files.
-    gclient_scm.scm.SVN.CaptureStatus(gclient_scm.os.path.join(base_path, '.')
-        ).AndReturn([])
+    gclient_scm.scm.SVN.CaptureStatus(join(self.base_path, '.')).AndReturn([])
 
     # Now we fall back on scm.update().
     files_list = self.mox.CreateMockAnything()
-    gclient_scm.os.path.exists(gclient_scm.os.path.join(base_path, '.git')
-                               ).AndReturn(False)
-    gclient_scm.os.path.exists(base_path).AndReturn(True)
+    gclient_scm.os.path.exists(join(self.base_path, '.git')).AndReturn(False)
+    gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(False)
+    gclient_scm.os.path.exists(self.base_path).AndReturn(True)
     gclient_scm.scm.SVN.CaptureInfo(
-        gclient_scm.os.path.join(base_path, ".")).AndReturn(file_info)
+        join(self.base_path, '.')).AndReturn(file_info)
     gclient_scm.scm.SVN.CaptureInfo(file_info['URL']).AndReturn(file_info)
 
     self.mox.ReplayAll()
     scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
                             relpath=self.relpath)
     scm.updatesingle(options, ['DEPS'], files_list)
     self.checkstdout('\n_____ %s at 42\n' % self.relpath)
 
   def testUpdateGit(self):
     options = self.Options(verbose=True)
     file_path = gclient_scm.os.path.join(self.root_dir, self.relpath, '.git')
     gclient_scm.os.path.exists(file_path).AndReturn(True)
 
     self.mox.ReplayAll()
     scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
                             relpath=self.relpath)
     file_list = []
     scm.update(options, self.args, file_list)
     self.checkstdout(
         ('________ found .git directory; skipping %s\n' % self.relpath))
 
+  def testUpdateHg(self):
+    options = self.Options(verbose=True)
+    gclient_scm.os.path.exists(join(self.base_path, '.git')).AndReturn(False)
+    gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(True)
+
+    self.mox.ReplayAll()
+    scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
+                            relpath=self.relpath)
+    file_list = []
+    scm.update(options, self.args, file_list)
+    self.checkstdout(
+        ('________ found .hg directory; skipping %s\n' % self.relpath))
+
 
 class GitWrapperTestCase(GCBaseTestCase, StdoutCheck, TestCaseUtils,
                          unittest.TestCase):
   """This class doesn't use pymox."""
   class OptionsObject(object):
      def __init__(self, verbose=False, revision=None):
       self.verbose = verbose
       self.revision = revision
       self.manually_grab_svn_rev = True
       self.deps_os = None
@@ skipping 70 matching lines @@
     Popen(['git', 'config', '--unset', 'remote.origin.fetch'], stdout=PIPE,
         stderr=STDOUT, cwd=path).communicate()
     return True
 
   def setUp(self):
     TestCaseUtils.setUp(self)
     unittest.TestCase.setUp(self)
     self.url = 'git://foo'
     self.root_dir = tempfile.mkdtemp()
     self.relpath = '.'
-    self.base_path = gclient_scm.os.path.join(self.root_dir, 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)
 
   def tearDown(self):
     StdoutCheck.tearDown(self)
     TestCaseUtils.tearDown(self)
     unittest.TestCase.tearDown(self)
     rmtree(self.root_dir)
 
   def testDir(self):
     members = [
         'FullUrlForRelativeUrl', 'RunCommand',
         'cleanup', 'diff', 'export', 'pack', 'relpath', '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)
 
   def testRevertMissing(self):
     if not self.enabled:
       return
     options = self.Options()
-    file_path = gclient_scm.os.path.join(self.base_path, 'a')
+    file_path = join(self.base_path, 'a')
     scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir,
                                 relpath=self.relpath)
     file_list = []
     scm.update(options, None, file_list)
     gclient_scm.os.remove(file_path)
     file_list = []
     scm.revert(options, self.args, file_list)
     self.assertEquals(file_list, [file_path])
     file_list = []
     scm.diff(options, self.args, file_list)
     self.assertEquals(file_list, [])
     self.checkstdout(
         ('\n_____ . at refs/heads/master\nUpdating 069c602..a7142dc\n'
          'Fast-forward\n a |    1 +\n b |    1 +\n'
          ' 2 files changed, 2 insertions(+), 0 deletions(-)\n\n\n'
          '________ running \'git reset --hard origin/master\' in \'%s\'\n'
          'HEAD is now at a7142dc Personalized\n') %
-            gclient_scm.os.path.join(self.root_dir, '.'))
+            join(self.root_dir, '.'))
 
   def testRevertNone(self):
     if not self.enabled:
       return
     options = self.Options()
     scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir,
                                 relpath=self.relpath)
     file_list = []
     scm.update(options, None, file_list)
     file_list = []
     scm.revert(options, self.args, file_list)
     self.assertEquals(file_list, [])
     self.assertEquals(scm.revinfo(options, self.args, None),
                       'a7142dc9f0009350b96a11f372b6ea658592aa95')
     self.checkstdout(
       ('\n_____ . at refs/heads/master\nUpdating 069c602..a7142dc\n'
        'Fast-forward\n a |    1 +\n b |    1 +\n'
        ' 2 files changed, 2 insertions(+), 0 deletions(-)\n\n\n'
        '________ running \'git reset --hard origin/master\' in \'%s\'\n'
        'HEAD is now at a7142dc Personalized\n') %
-            gclient_scm.os.path.join(self.root_dir, '.'))
+            join(self.root_dir, '.'))
 
   def testRevertModified(self):
     if not self.enabled:
       return
     options = self.Options()
     scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir,
                                 relpath=self.relpath)
     file_list = []
     scm.update(options, None, file_list)
-    file_path = gclient_scm.os.path.join(self.base_path, 'a')
+    file_path = join(self.base_path, 'a')
     open(file_path, 'a').writelines('touched\n')
     file_list = []
     scm.revert(options, self.args, file_list)
     self.assertEquals(file_list, [file_path])
     file_list = []
     scm.diff(options, self.args, file_list)
     self.assertEquals(file_list, [])
     self.assertEquals(scm.revinfo(options, self.args, None),
                       'a7142dc9f0009350b96a11f372b6ea658592aa95')
     self.checkstdout(
       ('\n_____ . at refs/heads/master\nUpdating 069c602..a7142dc\n'
        'Fast-forward\n a |    1 +\n b |    1 +\n'
        ' 2 files changed, 2 insertions(+), 0 deletions(-)\n\n\n'
        '________ running \'git reset --hard origin/master\' in \'%s\'\n'
        'HEAD is now at a7142dc Personalized\n') %
-            gclient_scm.os.path.join(self.root_dir, '.'))
+            join(self.root_dir, '.'))
 
   def testRevertNew(self):
     if not self.enabled:
       return
     options = self.Options()
     scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir,
                                 relpath=self.relpath)
     file_list = []
     scm.update(options, None, file_list)
-    file_path = gclient_scm.os.path.join(self.base_path, 'c')
+    file_path = join(self.base_path, 'c')
     f = open(file_path, 'w')
     f.writelines('new\n')
     f.close()
     Popen(['git', 'add', 'c'], stdout=PIPE,
           stderr=STDOUT, cwd=self.base_path).communicate()
     file_list = []
     scm.revert(options, self.args, file_list)
     self.assertEquals(file_list, [file_path])
     file_list = []
     scm.diff(options, self.args, file_list)
     self.assertEquals(file_list, [])
     self.assertEquals(scm.revinfo(options, self.args, None),
                       'a7142dc9f0009350b96a11f372b6ea658592aa95')
     self.checkstdout(
       ('\n_____ . at refs/heads/master\nUpdating 069c602..a7142dc\n'
        'Fast-forward\n a |    1 +\n b |    1 +\n'
        ' 2 files changed, 2 insertions(+), 0 deletions(-)\n\n\n'
        '________ running \'git reset --hard origin/master\' in \'%s\'\n'
        'HEAD is now at a7142dc Personalized\n') %
-            gclient_scm.os.path.join(self.root_dir, '.'))
+            join(self.root_dir, '.'))
 
   def testStatusNew(self):
     if not self.enabled:
       return
     options = self.Options()
-    file_path = gclient_scm.os.path.join(self.base_path, 'a')
+    file_path = join(self.base_path, 'a')
     open(file_path, 'a').writelines('touched\n')
     scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir,
                                 relpath=self.relpath)
     file_list = []
     scm.status(options, self.args, file_list)
     self.assertEquals(file_list, [file_path])
     self.checkstdout(
         ('\n________ running \'git diff --name-status '
          '069c602044c5388d2d15c3f875b057c852003458\' in \'%s\'\nM\ta\n') %
-            gclient_scm.os.path.join(self.root_dir, '.'))
+            join(self.root_dir, '.'))
 
   def testStatus2New(self):
     if not self.enabled:
       return
     options = self.Options()
     expected_file_list = []
     for f in ['a', 'b']:
-        file_path = gclient_scm.os.path.join(self.base_path, f)
+        file_path = join(self.base_path, f)
         open(file_path, 'a').writelines('touched\n')
         expected_file_list.extend([file_path])
     scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir,
                                 relpath=self.relpath)
     file_list = []
     scm.status(options, self.args, file_list)
-    expected_file_list = [gclient_scm.os.path.join(self.base_path, x)
-                          for x in ['a', 'b']]
+    expected_file_list = [join(self.base_path, x) for x in ['a', 'b']]
     self.assertEquals(sorted(file_list), expected_file_list)
     self.checkstdout(
         ('\n________ running \'git diff --name-status '
          '069c602044c5388d2d15c3f875b057c852003458\' in \'%s\'\nM\ta\nM\tb\n') %
-            gclient_scm.os.path.join(self.root_dir, '.'))
+            join(self.root_dir, '.'))
 
   def testUpdateCheckout(self):
     if not self.enabled:
       return
     options = self.Options(verbose=True)
     root_dir = tempfile.mkdtemp()
     relpath = 'foo'
-    base_path = gclient_scm.os.path.join(root_dir, relpath)
-    url = gclient_scm.os.path.join(self.root_dir, self.relpath, '.git')
+    base_path = join(root_dir, relpath)
+    url = join(self.base_path, '.git')
     try:
       scm = gclient_scm.CreateSCM(url=url, root_dir=root_dir,
                                   relpath=relpath)
       file_list = []
       scm.update(options, (), file_list)
       self.assertEquals(len(file_list), 2)
-      self.assert_(gclient_scm.os.path.isfile(
-          gclient_scm.os.path.join(base_path, 'a')))
+      self.assert_(gclient_scm.os.path.isfile(join(base_path, 'a')))
       self.assertEquals(scm.revinfo(options, (), None),
                         '069c602044c5388d2d15c3f875b057c852003458')
     finally:
       rmtree(root_dir)
-    join = gclient_scm.os.path.join
     self.checkstdout(
         ('\n_____ foo at refs/heads/master\n\n'
          '________ running \'git clone -b master --verbose %s %s\' in \'%s\'\n'
          'Initialized empty Git repository in %s\n') %
             (join(self.root_dir, '.', '.git'), join(root_dir, 'foo'), root_dir,
              join(root_dir, 'foo', '.git') + '/'))
 
   def testUpdateUpdate(self):
     if not self.enabled:
       return
     options = self.Options()
-    expected_file_list = [gclient_scm.os.path.join(self.base_path, x)
-                          for x in ['a', 'b']]
+    expected_file_list = [join(self.base_path, x) for x in ['a', 'b']]
     scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir,
                                 relpath=self.relpath)
     file_list = []
     scm.update(options, (), file_list)
     self.assertEquals(file_list, expected_file_list)
     self.assertEquals(scm.revinfo(options, (), None),
                       'a7142dc9f0009350b96a11f372b6ea658592aa95')
     self.checkstdout(
         '\n_____ . at refs/heads/master\n'
         'Updating 069c602..a7142dc\nFast-forward\n a |    1 +\n b |    1 +\n'
         ' 2 files changed, 2 insertions(+), 0 deletions(-)\n\n')
 
   def testUpdateUnstagedConflict(self):
     if not self.enabled:
       return
     options = self.Options()
     scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir,
                                 relpath=self.relpath)
-    file_path = gclient_scm.os.path.join(self.base_path, 'b')
+    file_path = join(self.base_path, 'b')
     f = open(file_path, 'w').writelines('conflict\n')
     exception = (
         "error: Your local changes to 'b' would be overwritten by merge.  "
         "Aborting.\n"
         "Please, commit your changes or stash them before you can merge.\n")
     self.assertRaisesError(exception, scm.update, options, (), [])
     self.checkstdout('\n_____ . at refs/heads/master\n')
 
   def testUpdateConflict(self):
     if not self.enabled:
       return
     options = self.Options()
     scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir,
                                 relpath=self.relpath)
-    file_path = gclient_scm.os.path.join(self.base_path, 'b')
+    file_path = join(self.base_path, 'b')
     f = 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'
                  '\tYou have unstaged changes.\n'
                  '\tPlease commit, stash, or reset.\n')
     self.assertRaisesError(exception, scm.update, options, (), [])
     # The hash always changes. Use a cheap trick.
     start = ('\n________ running \'git commit -am test\' in \'%s\'\n'
-             '[new ') % gclient_scm.os.path.join(self.root_dir, '.')
+             '[new ') % join(self.root_dir, '.')
     end = ('] test\n 1 files changed, 1 insertions(+), '
          '1 deletions(-)\n\n_____ . at refs/heads/master\n'
          'Attempting rebase onto refs/remotes/origin/master...\n')
     self.assertTrue(gclient_scm.sys.stdout.getvalue().startswith(start))
     self.assertTrue(gclient_scm.sys.stdout.getvalue().endswith(end))
     self.assertEquals(len(gclient_scm.sys.stdout.getvalue()),
                       len(start) + len(end) + 7)
     gclient_scm.sys.stdout.close()
 
   def testUpdateNotGit(self):
     if not self.enabled:
       return
     options = self.Options()
     scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir,
                                 relpath=self.relpath)
-    git_path = gclient_scm.os.path.join(self.base_path, '.git')
+    git_path = join(self.base_path, '.git')
     rename(git_path, git_path + 'foo')
     exception = ('\n____ . at refs/heads/master\n'
                  '\tPath is not a git repo. No .git dir.\n'
                  '\tTo resolve:\n'
                  '\t\trm -rf .\n'
                  '\tAnd run gclient sync again\n')
     self.assertRaisesError(exception, scm.update, options, (), [])
 
   def testRevinfo(self):
     if not self.enabled:
       return
     options = self.Options()
     scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir,
                                 relpath=self.relpath)
     rev_info = scm.revinfo(options, (), None)
     self.assertEquals(rev_info, '069c602044c5388d2d15c3f875b057c852003458')
 
 
 if __name__ == '__main__':
   unittest.main()
 
 # vim: ts=2:sw=2:tw=80:et: