Cleaned up some testing support.

src/zc/buildout/testing.py

@@ -53,6 +53,10 @@ def system(command, input=''):
     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 buildoutSetUp(test):
 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 = '''\

src/zc/buildout/tests.py

@@ -71,26 +71,17 @@ def linkerTearDown(test):
     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'),