[Checkins] SVN: zc.buildout/trunk/src/zc/buildout/test Cleaned up
some testing support.
Jim Fulton
cvs-admin at zope.org
Sat Jun 17 12:05:50 EDT 2006
Log message for revision 68709:
Cleaned up some testing support.
Changed:
U zc.buildout/trunk/src/zc/buildout/testing.py
U zc.buildout/trunk/src/zc/buildout/tests.py
-=-
Modified: zc.buildout/trunk/src/zc/buildout/testing.py
===================================================================
--- zc.buildout/trunk/src/zc/buildout/testing.py 2006-06-17 16:05:00 UTC (rev 68708)
+++ zc.buildout/trunk/src/zc/buildout/testing.py 2006-06-17 16:05:47 UTC (rev 68709)
@@ -53,6 +53,10 @@
return o.read()
def buildoutSetUp(test):
+ # we both need to make sure that HOME isn't set and be prepared
+ # to restore whatever it was after the test.
+ test.globs['_oldhome'] = os.environ.pop('HOME', None)
+
sample = tempfile.mkdtemp('sample-buildout')
for name in ('bin', 'eggs', 'develop-eggs', 'parts'):
os.mkdir(os.path.join(sample, name))
@@ -92,6 +96,8 @@
def buildoutTearDown(test):
shutil.rmtree(test.globs['sample_buildout'])
os.chdir(test.globs['__original_wd__'])
+ if test.globs['_oldhome'] is not None:
+ os.environ['HOME'] = test.globs['_oldhome']
script_template = '''\
Modified: zc.buildout/trunk/src/zc/buildout/tests.py
===================================================================
--- zc.buildout/trunk/src/zc/buildout/tests.py 2006-06-17 16:05:00 UTC (rev 68708)
+++ zc.buildout/trunk/src/zc/buildout/tests.py 2006-06-17 16:05:47 UTC (rev 68709)
@@ -71,26 +71,17 @@
shutil.rmtree(test.globs['_sample_eggs_container'])
zc.buildout.testing.buildoutTearDown(test)
-def buildoutSetUp(test):
- zc.buildout.testing.buildoutSetUp(test)
- test.globs['_oldhome'] = os.environ.get('HOME')
-
-def buildoutTearDoen(test):
- if test.globs['_oldhome'] is not None:
- os.environ['HOME'] = test.globs['_oldhome']
-
+def buildoutTearDown(test):
shutil.rmtree(test.globs['extensions'])
shutil.rmtree(test.globs['home'])
zc.buildout.testing.buildoutTearDown(test)
-
def test_suite():
return unittest.TestSuite((
- #doctest.DocTestSuite(),
doctest.DocFileSuite(
'buildout.txt',
setUp=zc.buildout.testing.buildoutSetUp,
- tearDown=zc.buildout.testing.buildoutTearDown,
+ tearDown=buildoutTearDown,
checker=renormalizing.RENormalizing([
(re.compile('__buildout_signature__ = recipes-\S+'),
'__buildout_signature__ = recipes-SSSSSSSSSSS'),
More information about the Checkins
mailing list