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

Improve tests and remove some unused GIT test.

Browse Source 
This is needed to improve the git tests further in a later change.

BUG=54084
TEST=none

Review URL: http://codereview.chromium.org/3294017

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@58934 0039d316-1c4b-4281-b951-d872f2087c98
experimental/szager/collated-output
maruel@chromium.org 15 years ago
parent 54019f3c98
commit 389d6dea37
3 changed files with 137 additions and 159 deletions
Show Stats Download Patch File Download Diff File

157
tests/gclient_scm_test.py
Unescape Escape View File

@ -11,17 +11,18 @@ from shutil import rmtree
import StringIO import StringIO
from subprocess import Popen, PIPE, STDOUT from subprocess import Popen, PIPE, STDOUT
import tempfile import tempfile
import unittest
import __builtin__ import __builtin__
# Fixes include path. # Fixes include path.
from super_mox import mox, SuperMoxBaseTestBase, SuperMoxTestBase from super_mox import mox, TestCaseUtils, SuperMoxTestBase
import gclient_scm import gclient_scm
class GCBaseTestCase(SuperMoxTestBase): class GCBaseTestCase(object):
# Like unittest's assertRaises, but checks for Gclient.Error.
def assertRaisesError(self, msg, fn, *args, **kwargs): def assertRaisesError(self, msg, fn, *args, **kwargs):
"""Like unittest's assertRaises() but checks for Gclient.Error."""
try: try:
fn(*args, **kwargs) fn(*args, **kwargs)
except gclient_scm.gclient_utils.Error, e: except gclient_scm.gclient_utils.Error, e:
@ -29,15 +30,33 @@ class GCBaseTestCase(SuperMoxTestBase):
else: else:
self.fail('%s not raised' % msg) self.fail('%s not raised' % msg)
def setUp(self):
self.stdout = StringIO.StringIO()
def tearDown(self):
try:
self.stdout.getvalue()
self.fail()
except AttributeError:
pass
class BaseTestCase(GCBaseTestCase): def checkstdout(self, expected):
value = self.stdout.getvalue()
self.stdout.close()
self.assertEquals(expected, value)
class BaseTestCase(GCBaseTestCase, SuperMoxTestBase):
def setUp(self): def setUp(self):
GCBaseTestCase.setUp(self) GCBaseTestCase.setUp(self)
SuperMoxTestBase.setUp(self)
self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'CheckCall')
self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'CheckCallAndFilter') self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'CheckCallAndFilter')
self.mox.StubOutWithMock(gclient_scm.gclient_utils, self.mox.StubOutWithMock(gclient_scm.gclient_utils,
'CheckCallAndFilterAndHeader') 'CheckCallAndFilterAndHeader')
self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'FileRead') self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'FileRead')
self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'FileWrite') 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.mox.StubOutWithMock(gclient_scm.gclient_utils, 'RemoveDirectory')
self._CaptureSVNInfo = gclient_scm.scm.SVN.CaptureInfo self._CaptureSVNInfo = gclient_scm.scm.SVN.CaptureInfo
self.mox.StubOutWithMock(gclient_scm.scm.SVN, 'Capture') self.mox.StubOutWithMock(gclient_scm.scm.SVN, 'Capture')
@ -47,20 +66,10 @@ class BaseTestCase(GCBaseTestCase):
self._scm_wrapper = gclient_scm.CreateSCM self._scm_wrapper = gclient_scm.CreateSCM
gclient_scm.sys.stdout.flush = lambda: None gclient_scm.sys.stdout.flush = lambda: None
gclient_scm.scm.SVN.current_version = None gclient_scm.scm.SVN.current_version = None
self.stdout = StringIO.StringIO()
def tearDown(self): def tearDown(self):
GCBaseTestCase.tearDown(self) GCBaseTestCase.tearDown(self)
try: SuperMoxTestBase.tearDown(self)
self.stdout.getvalue()
self.fail()
except AttributeError:
pass
def checkstdout(self, expected):
value = self.stdout.getvalue()
self.stdout.close()
self.assertEquals(expected, value)
class SVNWrapperTestCase(BaseTestCase): class SVNWrapperTestCase(BaseTestCase):
@ -80,10 +89,7 @@ class SVNWrapperTestCase(BaseTestCase):
def setUp(self): def setUp(self):
BaseTestCase.setUp(self) BaseTestCase.setUp(self)
self.root_dir = self.Dir() self.url = self.SvnUrl()
self.args = self.Args()
self.url = self.Url()
self.relpath = 'asf'
def testDir(self): def testDir(self):
members = [ members = [
@ -497,7 +503,7 @@ class SVNWrapperTestCase(BaseTestCase):
('________ found .git directory; skipping %s\n' % self.relpath)) ('________ found .git directory; skipping %s\n' % self.relpath))
class GitWrapperTestCase(BaseTestCase): class GitWrapperTestCase(GCBaseTestCase, TestCaseUtils, unittest.TestCase):
"""This class doesn't use pymox.""" """This class doesn't use pymox."""
class OptionsObject(object): class OptionsObject(object):
def __init__(self, test_case, verbose=False, revision=None): def __init__(self, test_case, verbose=False, revision=None):
@ -508,7 +514,7 @@ class GitWrapperTestCase(BaseTestCase):
self.force = False self.force = False
self.reset = False self.reset = False
self.nohooks = False self.nohooks = False
self.stdout = StringIO.StringIO() self.stdout = test_case.stdout
sample_git_import = """blob sample_git_import = """blob
mark :1 mark :1
@ -561,36 +567,39 @@ from :3
def CreateGitRepo(self, git_import, path): def CreateGitRepo(self, git_import, path):
"""Do it for real.""" """Do it for real."""
try: try:
Popen(['git', 'init'], stdout=PIPE, stderr=STDOUT, Popen(['git', 'init', '-q'], stdout=PIPE, stderr=STDOUT,
cwd=path).communicate() cwd=path).communicate()
except OSError: except OSError:
# git is not available, skip this test. # git is not available, skip this test.
return False return False
Popen(['git', 'fast-import'], stdin=PIPE, stdout=PIPE, stderr=STDOUT, Popen(['git', 'fast-import', '--quiet'], stdin=PIPE, stdout=PIPE,
cwd=path).communicate(input=git_import) stderr=STDOUT, cwd=path).communicate(input=git_import)
Popen(['git', 'checkout'], stdout=PIPE, stderr=STDOUT, Popen(['git', 'checkout', '-q'], stdout=PIPE, stderr=STDOUT,
cwd=path).communicate() cwd=path).communicate()
Popen(['git', 'remote', 'add', '-f', 'origin', '.'], stdout=PIPE, Popen(['git', 'remote', 'add', '-f', 'origin', '.'], stdout=PIPE,
stderr=STDOUT, cwd=path).communicate() stderr=STDOUT, cwd=path).communicate()
Popen(['git', 'checkout', '-b', 'new', 'origin/master'], stdout=PIPE, Popen(['git', 'checkout', '-b', 'new', 'origin/master', '-q'], stdout=PIPE,
stderr=STDOUT, cwd=path).communicate()
Popen(['git', 'push', 'origin', 'origin/origin:origin/master'], stdout=PIPE,
stderr=STDOUT, cwd=path).communicate() stderr=STDOUT, cwd=path).communicate()
Popen(['git', 'push', 'origin', 'origin/origin:origin/master', '-q'],
stdout=PIPE, stderr=STDOUT, cwd=path).communicate()
Popen(['git', 'config', '--unset', 'remote.origin.fetch'], stdout=PIPE, Popen(['git', 'config', '--unset', 'remote.origin.fetch'], stdout=PIPE,
stderr=STDOUT, cwd=path).communicate() stderr=STDOUT, cwd=path).communicate()
return True return True
def setUp(self): def setUp(self):
self.args = self.Args() GCBaseTestCase.setUp(self)
TestCaseUtils.setUp(self)
unittest.TestCase.setUp(self)
self.url = 'git://foo' self.url = 'git://foo'
self.root_dir = tempfile.mkdtemp() self.root_dir = tempfile.mkdtemp()
self.relpath = '.' self.relpath = '.'
self.base_path = gclient_scm.os.path.join(self.root_dir, self.relpath) self.base_path = gclient_scm.os.path.join(self.root_dir, self.relpath)
self.enabled = self.CreateGitRepo(self.sample_git_import, self.base_path) self.enabled = self.CreateGitRepo(self.sample_git_import, self.base_path)
BaseTestBase.setUp(self)
def tearDown(self): def tearDown(self):
BaseTestBase.tearDown(self) GCBaseTestCase.tearDown(self)
TestCaseUtils.tearDown(self)
unittest.TestCase.tearDown(self)
rmtree(self.root_dir) rmtree(self.root_dir)
def testDir(self): def testDir(self):
@ -602,6 +611,7 @@ from :3
# If you add a member, be sure to add the relevant test! # If you add a member, be sure to add the relevant test!
self.compareMembers(gclient_scm.CreateSCM(url=self.url), members) self.compareMembers(gclient_scm.CreateSCM(url=self.url), members)
self.checkstdout('')
def testRevertMissing(self): def testRevertMissing(self):
if not self.enabled: if not self.enabled:
@ -619,6 +629,11 @@ from :3
file_list = [] file_list = []
scm.diff(options, self.args, file_list) scm.diff(options, self.args, file_list)
self.assertEquals(file_list, []) self.assertEquals(file_list, [])
self.checkstdout(
('\n_____ . at refs/heads/master\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, '.'))
def testRevertNone(self): def testRevertNone(self):
if not self.enabled: if not self.enabled:
@ -633,7 +648,11 @@ from :3
self.assertEquals(file_list, []) self.assertEquals(file_list, [])
self.assertEquals(scm.revinfo(options, self.args, None), self.assertEquals(scm.revinfo(options, self.args, None),
'a7142dc9f0009350b96a11f372b6ea658592aa95') 'a7142dc9f0009350b96a11f372b6ea658592aa95')
self.checkstdout(
('\n_____ . at refs/heads/master\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, '.'))
def testRevertModified(self): def testRevertModified(self):
if not self.enabled: if not self.enabled:
@ -653,6 +672,11 @@ from :3
self.assertEquals(file_list, []) self.assertEquals(file_list, [])
self.assertEquals(scm.revinfo(options, self.args, None), self.assertEquals(scm.revinfo(options, self.args, None),
'a7142dc9f0009350b96a11f372b6ea658592aa95') 'a7142dc9f0009350b96a11f372b6ea658592aa95')
self.checkstdout(
('\n_____ . at refs/heads/master\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, '.'))
def testRevertNew(self): def testRevertNew(self):
if not self.enabled: if not self.enabled:
@ -676,6 +700,11 @@ from :3
self.assertEquals(file_list, []) self.assertEquals(file_list, [])
self.assertEquals(scm.revinfo(options, self.args, None), self.assertEquals(scm.revinfo(options, self.args, None),
'a7142dc9f0009350b96a11f372b6ea658592aa95') 'a7142dc9f0009350b96a11f372b6ea658592aa95')
self.checkstdout(
('\n_____ . at refs/heads/master\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, '.'))
def testStatusNew(self): def testStatusNew(self):
if not self.enabled: if not self.enabled:
@ -688,6 +717,10 @@ from :3
file_list = [] file_list = []
scm.status(options, self.args, file_list) scm.status(options, self.args, file_list)
self.assertEquals(file_list, [file_path]) 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, '.'))
def testStatus2New(self): def testStatus2New(self):
if not self.enabled: if not self.enabled:
@ -705,6 +738,10 @@ from :3
expected_file_list = [gclient_scm.os.path.join(self.base_path, x) expected_file_list = [gclient_scm.os.path.join(self.base_path, x)
for x in ['a', 'b']] for x in ['a', 'b']]
self.assertEquals(sorted(file_list), expected_file_list) 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, '.'))
def testUpdateCheckout(self): def testUpdateCheckout(self):
if not self.enabled: if not self.enabled:
@ -726,6 +763,13 @@ from :3
'069c602044c5388d2d15c3f875b057c852003458') '069c602044c5388d2d15c3f875b057c852003458')
finally: finally:
rmtree(root_dir) 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): def testUpdateUpdate(self):
if not self.enabled: if not self.enabled:
@ -740,6 +784,7 @@ from :3
self.assertEquals(file_list, expected_file_list) self.assertEquals(file_list, expected_file_list)
self.assertEquals(scm.revinfo(options, (), None), self.assertEquals(scm.revinfo(options, (), None),
'a7142dc9f0009350b96a11f372b6ea658592aa95') 'a7142dc9f0009350b96a11f372b6ea658592aa95')
self.checkstdout('\n_____ . at refs/heads/master\n\n')
def testUpdateUnstagedConflict(self): def testUpdateUnstagedConflict(self):
if not self.enabled: if not self.enabled:
@ -754,6 +799,7 @@ from :3
"Aborting.\n" "Aborting.\n"
"Please, commit your changes or stash them before you can merge.\n") "Please, commit your changes or stash them before you can merge.\n")
self.assertRaisesError(exception, scm.update, options, (), []) self.assertRaisesError(exception, scm.update, options, (), [])
self.checkstdout('\n_____ . at refs/heads/master\n')
def testUpdateConflict(self): def testUpdateConflict(self):
if not self.enabled: if not self.enabled:
@ -763,23 +809,26 @@ from :3
relpath=self.relpath) relpath=self.relpath)
file_path = gclient_scm.os.path.join(self.base_path, 'b') file_path = gclient_scm.os.path.join(self.base_path, 'b')
f = open(file_path, 'w').writelines('conflict\n') f = open(file_path, 'w').writelines('conflict\n')
scm._Run(['commit', '-am', 'test']) scm._Run(['commit', '-am', 'test'], options)
self.mox.StubOutWithMock(__builtin__, 'raw_input') __builtin__.raw_input = lambda x: 'y'
__builtin__.raw_input.__call__(mox.StrContains('Cannot fast-forward merge, ' exception = ('Conflict while rebasing this branch.\n'
'attempt to rebase? (y)es / ' 'Fix the conflict and run gclient again.\n'
'(q)uit / (s)kip : ') 'See \'man git-rebase\' for details.\n')
).AndReturn('y')
self.mox.ReplayAll()
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, (), []) self.assertRaisesError(exception, scm.update, options, (), [])
exception = \ exception = ('\n____ . at refs/heads/master\n'
'\n____ . at refs/heads/master\n' \ '\tYou have unstaged changes.\n'
'\tYou have unstaged changes.\n' \ '\tPlease commit, stash, or reset.\n')
'\tPlease commit, stash, or reset.\n'
self.assertRaisesError(exception, scm.update, options, (), []) 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, '.')
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(self.stdout.getvalue().startswith(start))
self.assertTrue(self.stdout.getvalue().endswith(end))
self.assertEquals(len(self.stdout.getvalue()), len(start) + len(end) + 7)
self.stdout.close()
def testUpdateNotGit(self): def testUpdateNotGit(self):
if not self.enabled: if not self.enabled:
@ -789,13 +838,13 @@ from :3
relpath=self.relpath) relpath=self.relpath)
git_path = gclient_scm.os.path.join(self.base_path, '.git') git_path = gclient_scm.os.path.join(self.base_path, '.git')
rename(git_path, git_path + 'foo') rename(git_path, git_path + 'foo')
exception = \ exception = ('\n____ . at refs/heads/master\n'
'\n____ . at refs/heads/master\n' \ '\tPath is not a git repo. No .git dir.\n'
'\tPath is not a git repo. No .git dir.\n' \ '\tTo resolve:\n'
'\tTo resolve:\n' \ '\t\trm -rf .\n'
'\t\trm -rf .\n' \ '\tAnd run gclient sync again\n')
'\tAnd run gclient sync again\n'
self.assertRaisesError(exception, scm.update, options, (), []) self.assertRaisesError(exception, scm.update, options, (), [])
self.checkstdout('')
def testRevinfo(self): def testRevinfo(self):
if not self.enabled: if not self.enabled:
@ -805,10 +854,10 @@ from :3
relpath=self.relpath) relpath=self.relpath)
rev_info = scm.revinfo(options, (), None) rev_info = scm.revinfo(options, (), None)
self.assertEquals(rev_info, '069c602044c5388d2d15c3f875b057c852003458') self.assertEquals(rev_info, '069c602044c5388d2d15c3f875b057c852003458')
self.checkstdout('')
if __name__ == '__main__': if __name__ == '__main__':
import unittest
unittest.main() unittest.main()
# vim: ts=2:sw=2:tw=80:et: # vim: ts=2:sw=2:tw=80:et:

94
tests/scm_unittest.py
Unescape Escape View File

@ -9,7 +9,7 @@ from shutil import rmtree
import tempfile import tempfile
# Fixes include path. # Fixes include path.
from super_mox import mox, SuperMoxBaseTestBase, SuperMoxTestBase from super_mox import mox, TestCaseUtils, SuperMoxTestBase
import scm import scm
@ -46,89 +46,8 @@ class RootTestCase(BaseSCMTestCase):
self.compareMembers(scm, members) self.compareMembers(scm, members)
class GitWrapperTestCase(SuperMoxBaseTestBase): class GitWrapperTestCase(BaseSCMTestCase):
sample_git_import = """blob
mark :1
data 6
Hello
blob
mark :2
data 4
Bye
reset refs/heads/master
commit refs/heads/master
mark :3
author Bob <bob@example.com> 1253744361 -0700
committer Bob <bob@example.com> 1253744361 -0700
data 8
A and B
M 100644 :1 a
M 100644 :2 b
blob
mark :4
data 10
Hello
You
blob
mark :5
data 8
Bye
You
commit refs/heads/origin
mark :6
author Alice <alice@example.com> 1253744424 -0700
committer Alice <alice@example.com> 1253744424 -0700
data 13
Personalized
from :3
M 100644 :4 a
M 100644 :5 b
reset refs/heads/master
from :3
"""
def CreateGitRepo(self, git_import, path):
try:
scm.subprocess.Popen(['git', 'init'],
stdout=scm.subprocess.PIPE,
stderr=scm.subprocess.STDOUT,
cwd=path).communicate()
except OSError:
# git is not available, skip this test.
return False
scm.subprocess.Popen(['git', 'fast-import'],
stdin=scm.subprocess.PIPE,
stdout=scm.subprocess.PIPE,
stderr=scm.subprocess.STDOUT,
cwd=path).communicate(input=git_import)
scm.subprocess.Popen(['git', 'checkout'],
stdout=scm.subprocess.PIPE,
stderr=scm.subprocess.STDOUT,
cwd=path).communicate()
return True
def setUp(self):
SuperMoxBaseTestBase.setUp(self)
self.args = self.Args()
self.url = 'git://foo'
self.root_dir = tempfile.mkdtemp()
self.relpath = '.'
self.base_path = scm.os.path.join(self.root_dir, self.relpath)
self.enabled = self.CreateGitRepo(self.sample_git_import, self.base_path)
self.fake_root = self.Dir()
def tearDown(self):
rmtree(self.root_dir)
SuperMoxBaseTestBase.tearDown(self)
def testMembersChanged(self): def testMembersChanged(self):
self.mox.ReplayAll()
members = [ members = [
'AssertVersion', 'Capture', 'CaptureStatus', 'AssertVersion', 'Capture', 'CaptureStatus',
'FetchUpstreamTuple', 'FetchUpstreamTuple',
@ -141,20 +60,17 @@ from :3
def testGetEmail(self): def testGetEmail(self):
self.mox.StubOutWithMock(scm.GIT, 'Capture') self.mox.StubOutWithMock(scm.GIT, 'Capture')
scm.GIT.Capture(['config', 'user.email'], self.fake_root, error_ok=True scm.GIT.Capture(['config', 'user.email'], self.root_dir, error_ok=True
).AndReturn(['mini@me.com', '']) ).AndReturn(['mini@me.com', ''])
self.mox.ReplayAll() self.mox.ReplayAll()
self.assertEqual(scm.GIT.GetEmail(self.fake_root), 'mini@me.com') self.assertEqual(scm.GIT.GetEmail(self.root_dir), 'mini@me.com')
class SVNTestCase(BaseSCMTestCase): class SVNTestCase(BaseSCMTestCase):
def setUp(self): def setUp(self):
BaseSCMTestCase.setUp(self) BaseSCMTestCase.setUp(self)
self.root_dir = self.Dir()
self.args = self.Args()
self.url = self.Url()
self.relpath = 'asf'
self.mox.StubOutWithMock(scm.SVN, 'Capture') self.mox.StubOutWithMock(scm.SVN, 'Capture')
self.url = self.SvnUrl()
def testMembersChanged(self): def testMembersChanged(self):
self.mox.ReplayAll() self.mox.ReplayAll()

37
tests/super_mox.py
Unescape Escape View File

@ -28,7 +28,7 @@ class IsOneOf(mox.Comparator):
return '<sequence or map containing \'%s\'>' % str(self._keys) return '<sequence or map containing \'%s\'>' % str(self._keys)
class SuperMoxBaseTestBase(mox.MoxTestBase): class TestCaseUtils(object):
"""Base class with some additional functionalities. People will usually want """Base class with some additional functionalities. People will usually want
to use SuperMoxTestBase instead.""" to use SuperMoxTestBase instead."""
# Backup the separator in case it gets mocked # Backup the separator in case it gets mocked
@ -56,7 +56,7 @@ class SuperMoxBaseTestBase(mox.MoxTestBase):
return (self._RANDOM_CHOICE((self._OS_SEP, '')) + return (self._RANDOM_CHOICE((self._OS_SEP, '')) +
self._DirElts(max_elt_count, max_elt_length)) self._DirElts(max_elt_count, max_elt_length))
def Url(self, max_elt_count=4, max_elt_length=8): def SvnUrl(self, max_elt_count=4, max_elt_length=8):
return ('svn://random_host:port/a' + return ('svn://random_host:port/a' +
self._DirElts(max_elt_count, max_elt_length self._DirElts(max_elt_count, max_elt_length
).replace(self._OS_SEP, '/')) ).replace(self._OS_SEP, '/'))
@ -64,11 +64,11 @@ class SuperMoxBaseTestBase(mox.MoxTestBase):
def RootDir(self, max_elt_count=4, max_elt_length=8): def RootDir(self, max_elt_count=4, max_elt_length=8):
return self._OS_SEP + self._DirElts(max_elt_count, max_elt_length) return self._OS_SEP + self._DirElts(max_elt_count, max_elt_length)
def compareMembers(self, object, members): def compareMembers(self, obj, members):
"""If you add a member, be sure to add the relevant test!""" """If you add a member, be sure to add the relevant test!"""
# Skip over members starting with '_' since they are usually not meant to # Skip over members starting with '_' since they are usually not meant to
# be for public use. # be for public use.
actual_members = [x for x in sorted(dir(object)) actual_members = [x for x in sorted(dir(obj))
if not x.startswith('_')] if not x.startswith('_')]
expected_members = sorted(members) expected_members = sorted(members)
if actual_members != expected_members: if actual_members != expected_members:
@ -77,18 +77,20 @@ class SuperMoxBaseTestBase(mox.MoxTestBase):
print>>sys.stderr, diff print>>sys.stderr, diff
self.assertEqual(actual_members, expected_members) self.assertEqual(actual_members, expected_members)
def UnMock(self, object, name): def setUp(self):
"""Restore an object inside a test.""" self.root_dir = self.Dir()
for (parent, old_child, child_name) in self.mox.stubs.cache: self.args = self.Args()
if parent == object and child_name == name: self.relpath = self.String(200)
setattr(parent, child_name, old_child)
break def tearDown(self):
pass
class SuperMoxTestBase(SuperMoxBaseTestBase): class SuperMoxTestBase(TestCaseUtils, mox.MoxTestBase):
def setUp(self): def setUp(self):
"""Patch a few functions with know side-effects.""" """Patch a few functions with know side-effects."""
SuperMoxBaseTestBase.setUp(self) TestCaseUtils.setUp(self)
mox.MoxTestBase.setUp(self)
#self.mox.StubOutWithMock(__builtin__, 'open') #self.mox.StubOutWithMock(__builtin__, 'open')
os_to_mock = ('chdir', 'chown', 'close', 'closerange', 'dup', 'dup2', os_to_mock = ('chdir', 'chown', 'close', 'closerange', 'dup', 'dup2',
'fchdir', 'fchmod', 'fchown', 'fdopen', 'getcwd', 'getpid', 'lseek', 'fchdir', 'fchmod', 'fchown', 'fdopen', 'getcwd', 'getpid', 'lseek',
@ -104,6 +106,10 @@ class SuperMoxTestBase(SuperMoxBaseTestBase):
# Don't mock stderr since it confuses unittests. # Don't mock stderr since it confuses unittests.
self.MockList(sys, ('stdin', 'stdout')) self.MockList(sys, ('stdin', 'stdout'))
def tearDown(self):
TestCaseUtils.tearDown(self)
mox.MoxTestBase.tearDown(self)
def MockList(self, parent, items_to_mock): def MockList(self, parent, items_to_mock):
for item in items_to_mock: for item in items_to_mock:
# Skip over items not present because of OS-specific implementation, # Skip over items not present because of OS-specific implementation,
@ -113,3 +119,10 @@ class SuperMoxTestBase(SuperMoxBaseTestBase):
self.mox.StubOutWithMock(parent, item) self.mox.StubOutWithMock(parent, item)
except TypeError: except TypeError:
raise TypeError('Couldn\'t mock %s in %s' % (item, parent.__name__)) raise TypeError('Couldn\'t mock %s in %s' % (item, parent.__name__))
def UnMock(self, object, name):
"""Restore an object inside a test."""
for (parent, old_child, child_name) in self.mox.stubs.cache:
if parent == object and child_name == name:
setattr(parent, child_name, old_child)
break

Write Preview
Loading…
Cancel
Save