Startup tests left a tainted Products.__path__.

lib/python/Zope2/Startup/tests/testStarter.py

@@ -26,6 +26,7 @@ from ZConfig.components.logger.tests import test_logger
 from ZConfig.components.logger.loghandler import NullHandler
 
 import Zope2.Startup
+import Products
 
 from App.config import getConfiguration, setConfiguration
 
@@ -63,6 +64,8 @@ class ZopeStarterTestCase(test_logger.LoggingTestBase):
             os.rmdir(TEMPNAME)
         except:
             pass
+        Products.__path__ = [d for d in Products.__path__
+                             if os.path.exists(d)]
         test_logger.LoggingTestBase.tearDown(self)
         # reset logger states
         for name in (None, 'access', 'trace'):

lib/python/Zope2/Startup/tests/test_schema.py

@@ -21,6 +21,7 @@ import unittest
 
 import ZConfig
 import Zope2.Startup
+import Products
 
 from Zope2.Startup import datatypes
 
@@ -43,6 +44,10 @@ class StartupTestCase(unittest.TestCase):
         if self.schema is None:
             StartupTestCase.schema = getSchema()
 
+    def tearDown(self):
+        Products.__path__ = [d for d in Products.__path__
+                             if os.path.exists(d)]
+
     def load_config_text(self, text):
         # We have to create a directory of our own since the existence
         # of the directory is checked.  This handles this in a

lib/python/Zope2/Startup/tests/test_warnfilter.py

@@ -23,6 +23,7 @@ import warnings
 
 import ZConfig
 import Zope2.Startup
+import Products
 
 from Zope2.Startup import datatypes
 
@@ -52,6 +53,8 @@ class TestWarnFilter(unittest.TestCase):
 
     def tearDown(self):
         warnings.filters[:] = self.original_warning_filters
+        Products.__path__ = [d for d in Products.__path__
+                             if os.path.exists(d)]
 
     def load_config_text(self, text):
         # We have to create a directory of our own since the existence