Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1574)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: tests/gclient_scm_test.py

Issue 10034011: Check the existence and executability of scm commands (Closed) Base URL: http://src.chromium.org/svn/trunk/tools/depot_tools/
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gclient_utils.py ('k') | tests/gclient_utils_test.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/gclient_scm_test.py
===================================================================
--- tests/gclient_scm_test.py (revision 132376)
+++ tests/gclient_scm_test.py (working copy)
@@ -55,6 +55,7 @@
'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')
@@ -111,6 +112,9 @@
'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)
@@ -122,6 +126,7 @@
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)
@@ -130,6 +135,7 @@
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)
@@ -138,6 +144,7 @@
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)
@@ -146,6 +153,7 @@
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)
@@ -155,6 +163,7 @@
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,
@@ -169,6 +178,7 @@
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
@@ -211,6 +221,7 @@
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')
@@ -230,6 +241,7 @@
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([])
@@ -250,6 +262,7 @@
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'),
]
@@ -279,6 +292,7 @@
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 = [
('~ ', '.'),
]
@@ -302,6 +316,7 @@
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,
@@ -324,6 +339,7 @@
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.
@@ -358,6 +374,7 @@
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, '.')
@@ -398,6 +415,7 @@
'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)
@@ -431,6 +449,7 @@
'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)
@@ -476,6 +495,7 @@
).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, '.')
@@ -515,6 +535,7 @@
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()
@@ -543,6 +564,7 @@
# 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(
@@ -587,6 +609,7 @@
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, '.')
@@ -610,6 +633,7 @@
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)
@@ -623,6 +647,7 @@
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)
@@ -645,6 +670,7 @@
).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()
@@ -1104,6 +1130,7 @@
).AndReturn(False)
gclient_scm.scm.os.path.isdir(self.base_path).AndReturn(True)
+ gclient_scm.gclient_utils.FindCommandExecutable('git').AndReturn("./git")
self.mox.ReplayAll()
@@ -1157,6 +1184,7 @@
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()
« no previous file with comments | « gclient_utils.py ('k') | tests/gclient_utils_test.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698