aiden
/
depot_tools
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove the options.path_exists which only existed as a seam. It's not really needed in python.

Browse Source 
Also fix 2 other mocks.
Review URL: http://codereview.chromium.org/115286

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@15976 0039d316-1c4b-4281-b951-d872f2087c98
experimental/szager/collated-output
maruel@chromium.org 16 years ago
parent 1033accb23
commit 0329e67bae
2 changed files with 94 additions and 51 deletions
Show Stats Download Patch File Download Diff File

15
gclient.py
Unescape Escape View File

@ -753,8 +753,8 @@ class SCMWrapper(object):
""" """
# Only update if git is not controlling the directory. # Only update if git is not controlling the directory.
checkout_path = os.path.join(self._root_dir, self.relpath) checkout_path = os.path.join(self._root_dir, self.relpath)
git_path = os.path.join(checkout_path, '.git') git_path = os.path.join(self._root_dir, self.relpath, '.git')
if options.path_exists(git_path): if os.path.exists(git_path):
print("________ found .git directory; skipping %s" % self.relpath) print("________ found .git directory; skipping %s" % self.relpath)
return return
@ -778,7 +778,7 @@ class SCMWrapper(object):
if revision: if revision:
rev_str = ' at %d' % revision rev_str = ' at %d' % revision
if not options.path_exists(checkout_path): if not os.path.exists(checkout_path):
# We need to checkout. # We need to checkout.
command = ['checkout', url, checkout_path] command = ['checkout', url, checkout_path]
if revision: if revision:
@ -965,7 +965,7 @@ class GClient(object):
if not from_dir: if not from_dir:
from_dir = os.curdir from_dir = os.curdir
path = os.path.realpath(from_dir) path = os.path.realpath(from_dir)
while not options.path_exists(os.path.join(path, options.config_filename)): while not os.path.exists(os.path.join(path, options.config_filename)):
next = os.path.split(path) next = os.path.split(path)
if not next[1]: if not next[1]:
return None return None
@ -1006,7 +1006,7 @@ class GClient(object):
""" """
scope = {} scope = {}
filename = os.path.join(self._root_dir, self._options.entries_filename) filename = os.path.join(self._root_dir, self._options.entries_filename)
if not self._options.path_exists(filename): if not os.path.exists(filename):
return [] return []
exec(FileRead(filename), scope) exec(FileRead(filename), scope)
return scope["entries"] return scope["entries"]
@ -1336,7 +1336,7 @@ class GClient(object):
prev_entries = self._ReadEntries() prev_entries = self._ReadEntries()
for entry in prev_entries: for entry in prev_entries:
e_dir = os.path.join(self._root_dir, entry) e_dir = os.path.join(self._root_dir, entry)
if entry not in entries and self._options.path_exists(e_dir): if entry not in entries and os.path.exists(e_dir):
if CaptureSVNStatus(e_dir): if CaptureSVNStatus(e_dir):
# There are modified files in this entry # There are modified files in this entry
entries[entry] = None # Keep warning until removed. entries[entry] = None # Keep warning until removed.
@ -1488,7 +1488,7 @@ def DoConfig(options, args):
""" """
if len(args) < 1 and not options.spec: if len(args) < 1 and not options.spec:
raise Error("required argument missing; see 'gclient help config'") raise Error("required argument missing; see 'gclient help config'")
if options.path_exists(options.config_filename): if os.path.exists(options.config_filename):
raise Error("%s file already exists in the current directory" % raise Error("%s file already exists in the current directory" %
options.config_filename) options.config_filename)
client = options.gclient('.', options) client = options.gclient('.', options)
@ -1713,7 +1713,6 @@ def Main(argv):
options.entries_filename = ".gclient_entries" options.entries_filename = ".gclient_entries"
options.deps_file = "DEPS" options.deps_file = "DEPS"
options.path_exists = os.path.exists
options.gclient = GClient options.gclient = GClient
options.scm_wrapper = SCMWrapper options.scm_wrapper = SCMWrapper
options.platform = sys.platform options.platform = sys.platform

130
tests/gclient_test.py
Unescape Escape View File

@ -119,6 +119,8 @@ class GClientBaseTestCase(BaseTestCase):
gclient.sys.stdout = self.mox.CreateMock(self._sys_stdout) gclient.sys.stdout = self.mox.CreateMock(self._sys_stdout)
self._subprocess = gclient.subprocess self._subprocess = gclient.subprocess
gclient.subprocess = self.mox.CreateMock(self._subprocess) gclient.subprocess = self.mox.CreateMock(self._subprocess)
self._os_path_exists = gclient.os.path.exists
gclient.os.path.exists = self.mox.CreateMockAnything()
def tearDown(self): def tearDown(self):
gclient.CaptureSVN = self._CaptureSVN gclient.CaptureSVN = self._CaptureSVN
@ -131,6 +133,7 @@ class GClientBaseTestCase(BaseTestCase):
gclient.RunSVNAndGetFileList = self._RunSVNAndGetFileList gclient.RunSVNAndGetFileList = self._RunSVNAndGetFileList
gclient.sys.stdout = self._sys_stdout gclient.sys.stdout = self._sys_stdout
gclient.subprocess = self._subprocess gclient.subprocess = self._subprocess
gclient.os.path.exists = self._os_path_exists
class GclientTestCase(GClientBaseTestCase): class GclientTestCase(GClientBaseTestCase):
@ -151,16 +154,12 @@ class GclientTestCase(GClientBaseTestCase):
self.head = False self.head = False
# Mox # Mox
self.path_exists = test_case.path_exists
self.platform = test_case.platform self.platform = test_case.platform
self.gclient = test_case.gclient self.gclient = test_case.gclient
self.scm_wrapper = test_case.scm_wrapper self.scm_wrapper = test_case.scm_wrapper
def setUp(self): def setUp(self):
GClientBaseTestCase.setUp(self) GClientBaseTestCase.setUp(self)
#self.subprocess = self.mox.CreateMock(subprocess)
# Stub os.path.exists.
self.path_exists = self.mox.CreateMockAnything()
self.platform = 'darwin' self.platform = 'darwin'
self.gclient = self.mox.CreateMock(gclient.GClient) self.gclient = self.mox.CreateMock(gclient.GClient)
@ -199,7 +198,7 @@ class TestDoConfig(GclientTestCase):
options = self.Options() options = self.Options()
exception_msg = ('%s file already exists in the current directory' % exception_msg = ('%s file already exists in the current directory' %
options.config_filename) options.config_filename)
self.path_exists(options.config_filename).AndReturn(True) gclient.os.path.exists(options.config_filename).AndReturn(True)
self.mox.ReplayAll() self.mox.ReplayAll()
self.assertRaisesError(exception_msg, gclient.DoConfig, options, (1,)) self.assertRaisesError(exception_msg, gclient.DoConfig, options, (1,))
@ -207,7 +206,7 @@ class TestDoConfig(GclientTestCase):
def testFromText(self): def testFromText(self):
options = self.Options(spec='config_source_content') options = self.Options(spec='config_source_content')
options.path_exists(options.config_filename).AndReturn(False) gclient.os.path.exists(options.config_filename).AndReturn(False)
options.gclient('.', options).AndReturn(options.gclient) options.gclient('.', options).AndReturn(options.gclient)
options.gclient.SetConfig(options.spec) options.gclient.SetConfig(options.spec)
options.gclient.SaveConfig() options.gclient.SaveConfig()
@ -218,7 +217,7 @@ class TestDoConfig(GclientTestCase):
def testCreateClientFile(self): def testCreateClientFile(self):
options = self.Options() options = self.Options()
options.path_exists(options.config_filename).AndReturn(False) gclient.os.path.exists(options.config_filename).AndReturn(False)
options.gclient('.', options).AndReturn(options.gclient) options.gclient('.', options).AndReturn(options.gclient)
options.gclient.SetDefaultConfig('the_name', 'http://svn/url/the_name', options.gclient.SetDefaultConfig('the_name', 'http://svn/url/the_name',
'other') 'other')
@ -430,7 +429,7 @@ class GClientClassTestCase(GclientTestCase):
self.gclient = self.mox.CreateMockAnything() self.gclient = self.mox.CreateMockAnything()
options = self.Options() options = self.Options()
path = os.path.realpath(self.root_dir) path = os.path.realpath(self.root_dir)
options.path_exists(os.path.join(path, options.config_filename) gclient.os.path.exists(os.path.join(path, options.config_filename)
).AndReturn(True) ).AndReturn(True)
options.gclient(path, options).AndReturn(options.gclient) options.gclient(path, options).AndReturn(options.gclient)
options.gclient._LoadConfig() options.gclient._LoadConfig()
@ -460,8 +459,10 @@ class GClientClassTestCase(GclientTestCase):
options = self.Options() options = self.Options()
checkout_path = os.path.join(self.root_dir, solution_name)
gclient.os.path.exists(os.path.join(checkout_path, '.git')).AndReturn(False)
# Expect a check for the entries file and we say there is not one. # Expect a check for the entries file and we say there is not one.
options.path_exists(os.path.join(self.root_dir, options.entries_filename) gclient.os.path.exists(os.path.join(self.root_dir, options.entries_filename)
).AndReturn(False) ).AndReturn(False)
# An scm will be requested for the solution. # An scm will be requested for the solution.
@ -514,8 +515,13 @@ class GClientClassTestCase(GclientTestCase):
options = self.Options() options = self.Options()
gclient.os.path.exists(os.path.join(self.root_dir, solution_name, 'src',
't', '.git')
).AndReturn(False)
gclient.os.path.exists(os.path.join(self.root_dir, solution_name, '.git')
).AndReturn(False)
# Expect a check for the entries file and we say there is not one. # Expect a check for the entries file and we say there is not one.
options.path_exists(os.path.join(self.root_dir, options.entries_filename) gclient.os.path.exists(os.path.join(self.root_dir, options.entries_filename)
).AndReturn(False) ).AndReturn(False)
# An scm will be requested for the solution. # An scm will be requested for the solution.
@ -583,8 +589,15 @@ class GClientClassTestCase(GclientTestCase):
options = self.Options() options = self.Options()
checkout_path = os.path.join(self.root_dir, solution_name)
gclient.os.path.exists(os.path.join(checkout_path, '.git')).AndReturn(False)
gclient.os.path.exists(os.path.join(self.root_dir, 'src/n', '.git')
).AndReturn(False)
gclient.os.path.exists(os.path.join(self.root_dir, 'src/t', '.git')
).AndReturn(False)
# Expect a check for the entries file and we say there is not one. # Expect a check for the entries file and we say there is not one.
options.path_exists(os.path.join(self.root_dir, options.entries_filename) gclient.os.path.exists(os.path.join(self.root_dir, options.entries_filename)
).AndReturn(False) ).AndReturn(False)
# An scm will be requested for the solution. # An scm will be requested for the solution.
@ -593,9 +606,8 @@ class GClientClassTestCase(GclientTestCase):
# Then an update will be performed. # Then an update will be performed.
scm_wrapper_sol.RunCommand('update', options, self.args, []) scm_wrapper_sol.RunCommand('update', options, self.args, [])
# Then an attempt will be made to read its DEPS file. # Then an attempt will be made to read its DEPS file.
gclient.FileRead(os.path.join(self.root_dir, gclient.FileRead(os.path.join(checkout_path, options.deps_file)
solution_name, ).AndReturn(deps)
options.deps_file)).AndReturn(deps)
# Next we expect an scm to be request for dep src/n even though it does not # Next we expect an scm to be request for dep src/n even though it does not
# exist in the DEPS file. # exist in the DEPS file.
@ -665,8 +677,15 @@ class GClientClassTestCase(GclientTestCase):
options = self.Options() options = self.Options()
gclient.os.path.exists(os.path.join(self.root_dir, name_a, '.git')
).AndReturn(False)
gclient.os.path.exists(os.path.join(self.root_dir, name_b, '.git')
).AndReturn(False)
gclient.os.path.exists(os.path.join(self.root_dir, 'src/t', '.git')
).AndReturn(False)
# Expect a check for the entries file and we say there is not one. # Expect a check for the entries file and we say there is not one.
options.path_exists(os.path.join(self.root_dir, options.entries_filename) gclient.os.path.exists(os.path.join(self.root_dir, options.entries_filename)
).AndReturn(False) ).AndReturn(False)
# An scm will be requested for the first solution. # An scm will be requested for the first solution.
@ -715,7 +734,9 @@ class GClientClassTestCase(GclientTestCase):
# pymox has trouble to mock the class object and not a class instance. # pymox has trouble to mock the class object and not a class instance.
self.scm_wrapper = self.mox.CreateMockAnything() self.scm_wrapper = self.mox.CreateMockAnything()
options = self.Options() options = self.Options()
options.path_exists(os.path.join(self.root_dir, options.entries_filename) gclient.os.path.exists(os.path.join(self.root_dir, name, '.git')
).AndReturn(False)
gclient.os.path.exists(os.path.join(self.root_dir, options.entries_filename)
).AndReturn(False) ).AndReturn(False)
options.scm_wrapper(self.url, self.root_dir, name).AndReturn( options.scm_wrapper(self.url, self.root_dir, name).AndReturn(
options.scm_wrapper) options.scm_wrapper)
@ -797,7 +818,21 @@ deps_os = {
gclient.FileWrite(os.path.join(self.root_dir, options.entries_filename), gclient.FileWrite(os.path.join(self.root_dir, options.entries_filename),
entries_content) entries_content)
options.path_exists(os.path.join(self.root_dir, options.entries_filename) gclient.os.path.exists(os.path.join(self.root_dir, 'src', '.git')
).AndReturn(False)
gclient.os.path.exists(os.path.join(self.root_dir, 'foo/third_party/WebKit',
'.git')
).AndReturn(False)
gclient.os.path.exists(os.path.join(self.root_dir, 'src/third_party/cygwin',
'.git')
).AndReturn(False)
gclient.os.path.exists(os.path.join(self.root_dir,
'src/third_party/python_24', '.git')
).AndReturn(False)
gclient.os.path.exists(os.path.join(self.root_dir, 'src/breakpad/bar',
'.git')
).AndReturn(False)
gclient.os.path.exists(os.path.join(self.root_dir, options.entries_filename)
).AndReturn(False) ).AndReturn(False)
options.scm_wrapper(self.url, self.root_dir, 'src').AndReturn( options.scm_wrapper(self.url, self.root_dir, 'src').AndReturn(
@ -902,7 +937,11 @@ deps = {
gclient.FileWrite(os.path.join(self.root_dir, options.entries_filename), gclient.FileWrite(os.path.join(self.root_dir, options.entries_filename),
entries_content) entries_content)
options.path_exists(os.path.join(self.root_dir, options.entries_filename) gclient.os.path.exists(os.path.join(self.root_dir, 'foo/third_party/WebKit',
'.git')).AndReturn(False)
gclient.os.path.exists(os.path.join(self.root_dir, name, '.git')
).AndReturn(False)
gclient.os.path.exists(os.path.join(self.root_dir, options.entries_filename)
).AndReturn(False) ).AndReturn(False)
options.scm_wrapper(self.url, self.root_dir, name).AndReturn( options.scm_wrapper(self.url, self.root_dir, name).AndReturn(
options.scm_wrapper) options.scm_wrapper)
@ -956,7 +995,12 @@ deps = {
gclient.FileWrite(os.path.join(self.root_dir, options.entries_filename), gclient.FileWrite(os.path.join(self.root_dir, options.entries_filename),
entries_content) entries_content)
options.path_exists(os.path.join(self.root_dir, options.entries_filename) gclient.os.path.exists(os.path.join(self.root_dir, 'foo/third_party/WebKit',
'.git')
).AndReturn(False)
gclient.os.path.exists(os.path.join(self.root_dir, name, '.git')
).AndReturn(False)
gclient.os.path.exists(os.path.join(self.root_dir, options.entries_filename)
).AndReturn(False) ).AndReturn(False)
options.scm_wrapper(self.url, self.root_dir, name).AndReturn( options.scm_wrapper(self.url, self.root_dir, name).AndReturn(
options.scm_wrapper) options.scm_wrapper)
@ -1000,7 +1044,7 @@ deps = {
gclient.FileWrite(os.path.join(self.root_dir, options.entries_filename), gclient.FileWrite(os.path.join(self.root_dir, options.entries_filename),
'dummy entries content') 'dummy entries content')
options.path_exists(os.path.join(self.root_dir, options.entries_filename) gclient.os.path.exists(os.path.join(self.root_dir, options.entries_filename)
).AndReturn(False) ).AndReturn(False)
options.scm_wrapper(self.url, self.root_dir, name).AndReturn( options.scm_wrapper(self.url, self.root_dir, name).AndReturn(
options.scm_wrapper) options.scm_wrapper)
@ -1070,17 +1114,18 @@ class SCMWrapperTestCase(GClientBaseTestCase):
self.deps_os = None self.deps_os = None
self.force = False self.force = False
# Mox
self.path_exists = test_case.path_exists
def setUp(self): def setUp(self):
GClientBaseTestCase.setUp(self) GClientBaseTestCase.setUp(self)
self.root_dir = Dir() self.root_dir = Dir()
self.args = Args() self.args = Args()
self.url = Url() self.url = Url()
self.relpath = 'asf' self.relpath = 'asf'
# Stub os.path.exists. self._os_path_isdir = gclient.os.path.isdir
self.path_exists = self.mox.CreateMockAnything() gclient.os.path.isdir = self.mox.CreateMockAnything()
def tearDown(self):
GClientBaseTestCase.tearDown(self)
gclient.os.path.isdir = self._os_path_isdir
def testDir(self): def testDir(self):
members = [ members = [
@ -1102,7 +1147,7 @@ class SCMWrapperTestCase(GClientBaseTestCase):
def testRunCommandException(self): def testRunCommandException(self):
options = self.Options(verbose=False) options = self.Options(verbose=False)
options.path_exists(os.path.join(self.root_dir, self.relpath, '.git') gclient.os.path.exists(os.path.join(self.root_dir, self.relpath, '.git')
).AndReturn(False) ).AndReturn(False)
self.mox.ReplayAll() self.mox.ReplayAll()
@ -1119,14 +1164,13 @@ class SCMWrapperTestCase(GClientBaseTestCase):
def testRevertMissing(self): def testRevertMissing(self):
options = self.Options(verbose=True) options = self.Options(verbose=True)
gclient.os.path.isdir = self.mox.CreateMockAnything()
base_path = os.path.join(self.root_dir, self.relpath) base_path = os.path.join(self.root_dir, self.relpath)
gclient.os.path.isdir(base_path).AndReturn(False) gclient.os.path.isdir(base_path).AndReturn(False)
# It'll to a checkout instead. # It'll to a checkout instead.
options.path_exists(os.path.join(base_path, '.git')).AndReturn(False) gclient.os.path.exists(os.path.join(base_path, '.git')).AndReturn(False)
print("\n_____ %s is missing, synching instead" % self.relpath) print("\n_____ %s is missing, synching instead" % self.relpath)
# Checkout. # Checkout.
options.path_exists(base_path).AndReturn(False) gclient.os.path.exists(base_path).AndReturn(False)
files_list = self.mox.CreateMockAnything() files_list = self.mox.CreateMockAnything()
gclient.RunSVNAndGetFileList(['checkout', self.url, base_path], gclient.RunSVNAndGetFileList(['checkout', self.url, base_path],
self.root_dir, files_list) self.root_dir, files_list)
@ -1136,12 +1180,10 @@ class SCMWrapperTestCase(GClientBaseTestCase):
relpath=self.relpath) relpath=self.relpath)
scm.revert(options, self.args, files_list) scm.revert(options, self.args, files_list)
self.mox.VerifyAll() self.mox.VerifyAll()
gclient.os.path.isdir = os.path.isdir
def testRevertNone(self): def testRevertNone(self):
options = self.Options(verbose=True) options = self.Options(verbose=True)
base_path = os.path.join(self.root_dir, self.relpath) base_path = os.path.join(self.root_dir, self.relpath)
gclient.os.path.isdir = self.mox.CreateMockAnything()
gclient.os.path.isdir(base_path).AndReturn(True) gclient.os.path.isdir(base_path).AndReturn(True)
gclient.CaptureSVNStatus(base_path).AndReturn([]) gclient.CaptureSVNStatus(base_path).AndReturn([])
@ -1151,12 +1193,10 @@ class SCMWrapperTestCase(GClientBaseTestCase):
file_list = [] file_list = []
scm.revert(options, self.args, file_list) scm.revert(options, self.args, file_list)
self.mox.VerifyAll() self.mox.VerifyAll()
gclient.os.path.isdir = os.path.isdir
def testRevert2Files(self): def testRevert2Files(self):
options = self.Options(verbose=True) options = self.Options(verbose=True)
base_path = os.path.join(self.root_dir, self.relpath) base_path = os.path.join(self.root_dir, self.relpath)
gclient.os.path.isdir = self.mox.CreateMockAnything()
gclient.os.path.isdir(base_path).AndReturn(True) gclient.os.path.isdir(base_path).AndReturn(True)
items = [ items = [
('M ', 'a'), ('M ', 'a'),
@ -1174,12 +1214,10 @@ class SCMWrapperTestCase(GClientBaseTestCase):
file_list = [] file_list = []
scm.revert(options, self.args, file_list) scm.revert(options, self.args, file_list)
self.mox.VerifyAll() self.mox.VerifyAll()
gclient.os.path.isdir = os.path.isdir
def testStatus(self): def testStatus(self):
options = self.Options(verbose=True) options = self.Options(verbose=True)
base_path = os.path.join(self.root_dir, self.relpath) base_path = os.path.join(self.root_dir, self.relpath)
gclient.os.path.isdir = self.mox.CreateMockAnything()
gclient.os.path.isdir(base_path).AndReturn(True) gclient.os.path.isdir(base_path).AndReturn(True)
gclient.RunSVNAndGetFileList(['status'] + self.args, base_path, gclient.RunSVNAndGetFileList(['status'] + self.args, base_path,
[]).AndReturn(None) []).AndReturn(None)
@ -1202,9 +1240,9 @@ class SCMWrapperTestCase(GClientBaseTestCase):
file_info.url = self.url file_info.url = self.url
file_info.uuid = 'ABC' file_info.uuid = 'ABC'
file_info.revision = 42 file_info.revision = 42
options.path_exists(os.path.join(base_path, '.git')).AndReturn(False) gclient.os.path.exists(os.path.join(base_path, '.git')).AndReturn(False)
# Checkout. # Checkout.
options.path_exists(base_path).AndReturn(False) gclient.os.path.exists(base_path).AndReturn(False)
files_list = self.mox.CreateMockAnything() files_list = self.mox.CreateMockAnything()
gclient.RunSVNAndGetFileList(['checkout', self.url, base_path], gclient.RunSVNAndGetFileList(['checkout', self.url, base_path],
self.root_dir, files_list) self.root_dir, files_list)
@ -1224,9 +1262,9 @@ class SCMWrapperTestCase(GClientBaseTestCase):
'UUID': 'ABC', 'UUID': 'ABC',
'Revision': 42, 'Revision': 42,
} }
options.path_exists(os.path.join(base_path, '.git')).AndReturn(False) gclient.os.path.exists(os.path.join(base_path, '.git')).AndReturn(False)
# Checkout or update. # Checkout or update.
options.path_exists(base_path).AndReturn(True) gclient.os.path.exists(base_path).AndReturn(True)
gclient.CaptureSVNInfo(os.path.join(base_path, "."), '.' gclient.CaptureSVNInfo(os.path.join(base_path, "."), '.'
).AndReturn(file_info) ).AndReturn(file_info)
# Cheat a bit here. # Cheat a bit here.
@ -1246,7 +1284,7 @@ class SCMWrapperTestCase(GClientBaseTestCase):
def testUpdateGit(self): def testUpdateGit(self):
options = self.Options(verbose=True) options = self.Options(verbose=True)
options.path_exists(os.path.join(self.root_dir, self.relpath, '.git') gclient.os.path.exists(os.path.join(self.root_dir, self.relpath, '.git')
).AndReturn(True) ).AndReturn(True)
print("________ found .git directory; skipping %s" % self.relpath) print("________ found .git directory; skipping %s" % self.relpath)
@ -1358,10 +1396,13 @@ class SubprocessCallAndCaptureTestCase(BaseTestCase):
gclient.sys.stdout = self.mox.CreateMock(self._sys_stdout) gclient.sys.stdout = self.mox.CreateMock(self._sys_stdout)
self._subprocess_Popen = gclient.subprocess.Popen self._subprocess_Popen = gclient.subprocess.Popen
gclient.subprocess.Popen = self.mox.CreateMockAnything() gclient.subprocess.Popen = self.mox.CreateMockAnything()
self._CaptureSVN = gclient.CaptureSVN
gclient.CaptureSVN = self.mox.CreateMockAnything()
def tearDown(self): def tearDown(self):
gclient.sys.stdout = self._sys_stdout gclient.sys.stdout = self._sys_stdout
gclient.subprocess.Popen = self._subprocess_Popen gclient.subprocess.Popen = self._subprocess_Popen
gclient.CaptureSVN = self._CaptureSVN
def testSubprocessCallAndCapture(self): def testSubprocessCallAndCapture(self):
command = ['boo', 'foo', 'bar'] command = ['boo', 'foo', 'bar']
@ -1376,7 +1417,7 @@ class SubprocessCallAndCaptureTestCase(BaseTestCase):
kid = Mock() kid = Mock()
print("\n________ running 'boo foo bar' in 'bleh'") print("\n________ running 'boo foo bar' in 'bleh'")
for i in test_string: for i in test_string:
sys.stdout.write(i) gclient.sys.stdout.write(i)
gclient.subprocess.Popen(command, bufsize=0, cwd=in_directory, gclient.subprocess.Popen(command, bufsize=0, cwd=in_directory,
shell=(sys.platform == 'win32'), shell=(sys.platform == 'win32'),
stdout=gclient.subprocess.PIPE).AndReturn(kid) stdout=gclient.subprocess.PIPE).AndReturn(kid)
@ -1389,7 +1430,9 @@ class SubprocessCallAndCaptureTestCase(BaseTestCase):
def testCaptureSVNStatus(self): def testCaptureSVNStatus(self):
x = self x = self
def CaptureSVNMock(command): def CaptureSVNMock(command, in_directory=None, print_error=True):
x.assertEquals(in_directory, None)
x.assertEquals(print_error, True)
x.assertEquals(['status', '--xml', '.'], command) x.assertEquals(['status', '--xml', '.'], command)
return r"""<?xml version="1.0"?> return r"""<?xml version="1.0"?>
<status> <status>
@ -1441,7 +1484,8 @@ class SubprocessCallAndCaptureTestCase(BaseTestCase):
def testCaptureSVNStatusEmpty(self): def testCaptureSVNStatusEmpty(self):
x = self x = self
def CaptureSVNMock(command): def CaptureSVNMock(command, in_directory=None, print_error=True):
x.assertEquals(in_directory, None)
x.assertEquals(['status', '--xml'], command) x.assertEquals(['status', '--xml'], command)
return r"""<?xml version="1.0"?> return r"""<?xml version="1.0"?>
<status> <status>

Write Preview
Loading…
Cancel
Save