Rely on refactored base class from ZConfig for testing logging.

zopefoundation · Aug 29, 2012 · 051853a · 051853a
1 parent 5d1ad40
commit 051853a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/setup.py b/setup.py
@@ -58,7 +58,7 @@
       'Products.ZCTextIndex',
       'Record',
       'RestrictedPython',
-      'ZConfig',
+      'ZConfig >= 2.9.2',
       'ZODB3',
       'ZopeUndo',
       'docutils',

diff --git a/src/Zope2/Startup/tests/testStarter.py b/src/Zope2/Startup/tests/testStarter.py
@@ -23,8 +23,8 @@
 import unittest
 
 import ZConfig
-from ZConfig.components.logger.tests import test_logger
-from ZConfig.components.logger.loghandler import NullHandler
+
+from ZConfig.components.logger.tests.test_logger import LoggingTestHelper
 
 import Zope2.Startup
 import Products
@@ -50,15 +50,14 @@ def getSchema():
                            'handlers':logger.handlers,
                            'filters':logger.filters}
 
-class ZopeStarterTestCase(test_logger.LoggingTestBase):
+class ZopeStarterTestCase(LoggingTestHelper, unittest.TestCase):
 
     schema = None
 
     def setUp(self):
-        from ZConfig.components.logger import loghandler
         if self.schema is None:
             ZopeStarterTestCase.schema = getSchema()
-        test_logger.LoggingTestBase.setUp(self)
+        LoggingTestHelper.setUp(self)
 
     def tearDown(self):
         try:
@@ -69,7 +68,7 @@ def tearDown(self):
         Products.__path__ = [d for d in Products.__path__
                              if os.path.exists(d)]
 
-        test_logger.LoggingTestBase.tearDown(self)
+        LoggingTestHelper.tearDown(self)
 
         # reset logger states
         for name in (None, 'access', 'trace'):