Revert r132446 "Check the existence and executability of scm commands"

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 37 matching lines @@
 
 
 class BaseTestCase(GCBaseTestCase, SuperMoxTestBase):
   def setUp(self):
     SuperMoxTestBase.setUp(self)
     self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'CheckCallAndFilter')
     self.mox.StubOutWithMock(gclient_scm.gclient_utils,
         'CheckCallAndFilterAndHeader')
     self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'FileRead')
     self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'FileWrite')
-    self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'FindCommandExecutable')
     self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'RemoveDirectory')
     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.mox.StubOutWithMock(subprocess2, 'communicate')
     self.mox.StubOutWithMock(subprocess2, 'Popen')
     self._scm_wrapper = gclient_scm.CreateSCM
     gclient_scm.scm.SVN.current_version = None
     # Absolute path of the fake checkout directory.
@@ skipping 36 matching lines @@
         'relpath',
         'revert',
         'revinfo',
         'runhooks',
         'status',
         'update',
         'updatesingle',
         'url',
     ]
 
-    gclient_scm.gclient_utils.FindCommandExecutable('svn').AndReturn("./svn")
-    self.mox.ReplayAll()
-
     # If you add a member, be sure to add the relevant test!
     self.compareMembers(self._scm_wrapper('svn://a'), members)
 
   def testUnsupportedSCM(self):
     args = ['gopher://foo', self.root_dir, self.relpath]
     exception_msg = 'No SCM found for url gopher://foo'
     self.assertRaisesError(exception_msg, self._scm_wrapper, *args)
 
   def testSVNFullUrlForRelativeUrl(self):
     self.url = 'svn://a/b/c/d'
 
-    gclient_scm.gclient_utils.FindCommandExecutable('svn').AndReturn("./svn")
     self.mox.ReplayAll()
     scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
                             relpath=self.relpath)
     self.assertEqual(scm.FullUrlForRelativeUrl('/crap'), 'svn://a/b/crap')
 
   def testGITFullUrlForRelativeUrl(self):
     self.url = 'git://a/b/c/d'
 
-    gclient_scm.gclient_utils.FindCommandExecutable('git').AndReturn("./git")
     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 testGITFakeHttpUrl(self):
     self.url = 'git+http://foo'
 
-    gclient_scm.gclient_utils.FindCommandExecutable('git').AndReturn("./git")
     self.mox.ReplayAll()
     scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
                             relpath=self.relpath)
     self.assertEqual(scm.url, 'http://foo')
 
   def testGITFakeHttpsUrl(self):
     self.url = 'git+https://foo'
 
-    gclient_scm.gclient_utils.FindCommandExecutable('git').AndReturn("./git")
     self.mox.ReplayAll()
     scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
                             relpath=self.relpath)
     self.assertEqual(scm.url, 'https://foo')
 
   def testRunCommandException(self):
     options = self.Options(verbose=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)
-    gclient_scm.gclient_utils.FindCommandExecutable('svn').AndReturn("./svn")
 
     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)
-    gclient_scm.gclient_utils.FindCommandExecutable('svn').AndReturn("./svn")
     gclient_scm.os.path.isdir(self.base_path).AndReturn(False)
     gclient_scm.os.path.exists(self.base_path).AndReturn(False)
     gclient_scm.scm.SVN.Capture(['--version'], None
         ).AndReturn('svn, version 1.5.1 (r32289)')
     # It'll to a checkout instead.
     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(self.base_path).AndReturn(False)
     parent = gclient_scm.os.path.dirname(self.base_path)
@@ skipping 22 matching lines @@
     gclient_scm.os.path.isdir(join(self.base_path, '.hg')).AndReturn(False)
     # Checkout.
     gclient_scm.os.path.exists(self.base_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)
     gclient_scm.os.path.exists(self.base_path).AndReturn(False)
     parent = gclient_scm.os.path.dirname(self.base_path)
     gclient_scm.os.path.exists(parent).AndReturn(False)
     gclient_scm.os.makedirs(parent)
     gclient_scm.os.path.exists(parent).AndReturn(True)
-    gclient_scm.gclient_utils.FindCommandExecutable('svn').AndReturn("./svn")
     files_list = self.mox.CreateMockAnything()
     gclient_scm.scm.SVN.Capture(['--version'], None
         ).AndReturn('svn, version 1.6')
     gclient_scm.scm.SVN.RunAndGetFileList(
         options.verbose,
         ['checkout', self.url, self.base_path, '--force', '--ignore-externals'],
         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 not a valid svn checkout, synching instead\n' %
         self.relpath)
 
   def testRevertNone(self):
     options = self.Options(verbose=True)
-    gclient_scm.gclient_utils.FindCommandExecutable('svn').AndReturn("./svn")
     gclient_scm.os.path.isdir(self.base_path).AndReturn(True)
     gclient_scm.os.path.isdir(join(self.base_path, '.svn')).AndReturn(True)
     gclient_scm.scm.SVN.CaptureStatus(None, self.base_path).AndReturn([])
     gclient_scm.os.path.isdir(self.base_path).AndReturn(True)
     gclient_scm.scm.SVN.RunAndGetFileList(
         options.verbose,
         ['update', '--revision', 'BASE', '--ignore-externals'],
         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 testRevertDirectory(self):
     options = self.Options(verbose=True)
     gclient_scm.os.path.isdir(self.base_path).AndReturn(True)
     gclient_scm.os.path.isdir(join(self.base_path, '.svn')).AndReturn(True)
-    gclient_scm.gclient_utils.FindCommandExecutable('svn').AndReturn("./svn")
     items = [
       ('~      ', 'a'),
     ]
     gclient_scm.scm.SVN.CaptureStatus(None, 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)
     gclient_scm.os.path.isdir(self.base_path).AndReturn(True)
     gclient_scm.scm.SVN.RunAndGetFileList(
         options.verbose,
         ['update', '--revision', 'BASE', '--ignore-externals'],
         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 testRevertDot(self):
     self.mox.StubOutWithMock(gclient_scm.SVNWrapper, 'update')
     options = self.Options(verbose=True)
     gclient_scm.os.path.isdir(self.base_path).AndReturn(True)
     gclient_scm.os.path.isdir(join(self.base_path, '.svn')).AndReturn(True)
-    gclient_scm.gclient_utils.FindCommandExecutable('svn').AndReturn("./svn")
     items = [
       ('~      ', '.'),
     ]
     gclient_scm.scm.SVN.CaptureStatus(None, self.base_path).AndReturn(items)
     file_path = join(self.base_path, '.')
     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)
     # pylint: disable=E1120
     gclient_scm.os.path.isdir(self.base_path).AndReturn(False)
     gclient_scm.SVNWrapper.update(options, [], ['.'])
 
     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)
-    gclient_scm.gclient_utils.FindCommandExecutable('svn').AndReturn("./svn")
     gclient_scm.os.path.isdir(self.base_path).AndReturn(True)
     gclient_scm.scm.SVN.RunAndGetFileList(
         options.verbose,
         ['status'] + self.args + ['--ignore-externals'],
         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)
     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.gclient_utils.FindCommandExecutable('svn').AndReturn("./svn")
     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(self.base_path).AndReturn(False)
     parent = gclient_scm.os.path.dirname(self.base_path)
     gclient_scm.os.path.exists(parent).AndReturn(False)
     gclient_scm.os.makedirs(parent)
     gclient_scm.os.path.exists(parent).AndReturn(True)
     files_list = self.mox.CreateMockAnything()
     gclient_scm.scm.SVN.Capture(['--version'], None
@@ skipping 14 matching lines @@
     options.nohooks = False
     file_info = {
       'Repository Root': 'blah',
       'URL': self.url,
       'UUID': 'ABC',
       'Revision': 42,
     }
     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.gclient_utils.FindCommandExecutable('svn').AndReturn("./svn")
 
     # Checkout or update.
     dotted_path = join(self.base_path, '.')
     gclient_scm.scm.SVN._CaptureInfo([], dotted_path).AndReturn(file_info)
 
     # Verify no locked files.
     gclient_scm.scm.SVN.CaptureStatus(None, dotted_path).AndReturn([])
 
     # Cheat a bit here.
     gclient_scm.scm.SVN._CaptureInfo([file_info['URL']], None
@@ skipping 20 matching lines @@
 
   def testUpdateReset(self):
     options = self.Options(verbose=True)
     options.reset = True
     file_info = {
       'Repository Root': 'blah',
       'URL': self.url,
       'UUID': 'ABC',
       'Revision': 42,
     }
-    gclient_scm.gclient_utils.FindCommandExecutable('svn').AndReturn("./svn")
     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)
 
     # Checkout or update.
     dotted_path = join(self.base_path, '.')
     gclient_scm.scm.SVN._CaptureInfo([], dotted_path).AndReturn(file_info)
 
     # Create an untracked file and directory.
     gclient_scm.scm.SVN.CaptureStatus(None, dotted_path
@@ skipping 13 matching lines @@
     options = self.Options(verbose=True)
     options.reset = True
     options.delete_unversioned_trees = True
 
     file_info = {
       'Repository Root': 'blah',
       'URL': self.url,
       'UUID': 'ABC',
       'Revision': 42,
     }
-    gclient_scm.gclient_utils.FindCommandExecutable('svn').AndReturn("./svn")
     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)
 
     # Checkout or update.
     dotted_path = join(self.base_path, '.')
     gclient_scm.scm.SVN._CaptureInfo([], dotted_path).AndReturn(file_info)
 
     # Create an untracked file and directory.
     gclient_scm.scm.SVN.CaptureStatus(None, dotted_path
@@ skipping 25 matching lines @@
       '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'], None
         ).AndReturn('svn, version 1.5.1 (r32289)')
     gclient_scm.os.path.exists(join(self.base_path, '.svn')).AndReturn(False)
     gclient_scm.os.path.exists(join(self.base_path, 'DEPS')).AndReturn(False)
-    gclient_scm.gclient_utils.FindCommandExecutable('svn').AndReturn("./svn")
 
     # Verify no locked files.
     dotted_path = join(self.base_path, '.')
     gclient_scm.scm.SVN.CaptureStatus(None, 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, self.base_path],
         always=True,
@@ skipping 19 matching lines @@
     self.checkstdout('\n_____ %s at 42\n' % self.relpath)
 
   def testUpdateSingleCheckoutSVN14(self):
     options = self.Options(verbose=True)
 
     # Checks to make sure that we support svn co --depth.
     gclient_scm.scm.SVN.current_version = None
     gclient_scm.scm.SVN.Capture(['--version'], None
         ).AndReturn('svn, version 1.4.4 (r25188)')
     gclient_scm.os.path.exists(self.base_path).AndReturn(True)
-    gclient_scm.gclient_utils.FindCommandExecutable('svn').AndReturn("./svn")
 
     # 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', 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)
     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'], None
         ).AndReturn('svn, version 1.5.1 (r32289)')
     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(join(self.base_path, 'DEPS')).AndReturn(True)
     gclient_scm.os.remove(join(self.base_path, 'DEPS'))
-    gclient_scm.gclient_utils.FindCommandExecutable('svn').AndReturn("./svn")
 
     # Verify no locked files.
     gclient_scm.scm.SVN.CaptureStatus(
         None, 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, self.base_path],
         always=True,
@@ skipping 24 matching lines @@
     options = self.Options(verbose=True)
     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'], None
         ).AndReturn('svn, version 1.5.1 (r32289)')
     gclient_scm.os.path.exists(join(self.base_path, '.svn')).AndReturn(True)
-    gclient_scm.gclient_utils.FindCommandExecutable('svn').AndReturn("./svn")
 
     # Verify no locked files.
     gclient_scm.scm.SVN.CaptureStatus(None, join(self.base_path, '.')
         ).AndReturn([])
 
     # Now we fall back on scm.update().
     files_list = self.mox.CreateMockAnything()
     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(
         [], join(self.base_path, '.')).AndReturn(file_info)
     gclient_scm.scm.SVN._CaptureInfo([file_info['URL']], None
         ).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)
-    gclient_scm.gclient_utils.FindCommandExecutable('svn').AndReturn("./svn")
     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.gclient_utils.FindCommandExecutable('svn').AndReturn("./svn")
     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))
 
   def testGetUsableRevSVN(self):
     # pylint: disable=E1101
     options = self.Options(verbose=True)
 
     # Mock SVN revision validity checking.
     self.mox.StubOutWithMock(
         gclient_scm.scm.SVN, 'IsValidRevision', True)
     gclient_scm.scm.SVN.IsValidRevision(url='%s@%s' % (self.url, 1)
         ).AndReturn(True)
     gclient_scm.scm.SVN.IsValidRevision(url='%s@%s' % (self.url, 'fake')
         ).AndReturn(False)
-    gclient_scm.gclient_utils.FindCommandExecutable('svn').AndReturn("./svn")
 
     self.mox.ReplayAll()
 
     svn_scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir)
     # With an SVN checkout, 1 an example of a valid usable rev.
     self.assertEquals(svn_scm.GetUsableRev(1, options), 1)
     # With an SVN checkout, a fake or unknown rev should raise an excpetion.
     self.assertRaises(gclient_scm.gclient_utils.Error,
                       svn_scm.GetUsableRev, 'fake', options)
 
@@ skipping 439 matching lines @@
 
     self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsValidRevision', True)
     gclient_scm.scm.GIT.IsValidRevision(cwd=self.base_path, rev=self.fake_hash_1
         ).AndReturn(True)
 
     self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsGitSvn', True)
     gclient_scm.scm.GIT.IsGitSvn(cwd=self.base_path).MultipleTimes(
         ).AndReturn(False)
 
     gclient_scm.scm.os.path.isdir(self.base_path).AndReturn(True)
-    gclient_scm.gclient_utils.FindCommandExecutable('git').AndReturn("./git")
 
     self.mox.ReplayAll()
 
     git_scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir,
                                     relpath=self.relpath)
     # A [fake] git sha1 with a git repo should work (this is in the case that
     # the LKGR gets flipped to git sha1's some day).
     self.assertEquals(git_scm.GetUsableRev(self.fake_hash_1, options),
                       self.fake_hash_1)
     # An SVN rev with an existing purely git repo should raise an exception.
@@ skipping 33 matching lines @@
         ).AndReturn(True)
 
     self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsValidRevision', True)
     gclient_scm.scm.GIT.IsValidRevision(cwd=self.base_path, rev=self.fake_hash_1
         ).AndReturn(True)
     gclient_scm.scm.GIT.IsValidRevision(cwd=self.base_path, rev=too_big
         ).AndReturn(False)
 
     gclient_scm.os.path.isdir(self.base_path).AndReturn(False)
     gclient_scm.os.path.isdir(self.base_path).MultipleTimes().AndReturn(True)
-    gclient_scm.gclient_utils.FindCommandExecutable('git').AndReturn("./git")
 
     self.mox.ReplayAll()
 
     git_svn_scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
                                     relpath=self.relpath)
     # Without an existing checkout, this should fail.
     # TODO(dbeam) Fix this. http://crbug.com/109184
     self.assertRaises(gclient_scm.gclient_utils.Error,
                       git_svn_scm.GetUsableRev, '1', options)
     # Given an SVN revision with a git-svn checkout, it should be translated to
@@ skipping 36 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: