[Zope-Checkins] SVN: Zope/trunk/ Rely on refactored base class from ZConfig for testing logging.

[Tres Seaver]

Log message for revision 127613:
  Rely on refactored base class from ZConfig for testing logging.

Changed:
  _U  Zope/trunk/
  U   Zope/trunk/setup.py
  U   Zope/trunk/src/Zope2/Startup/tests/testStarter.py

-=-
Modified: Zope/trunk/setup.py
===================================================================
--- Zope/trunk/setup.py	2012-08-29 13:43:01 UTC (rev 127612)
+++ Zope/trunk/setup.py	2012-08-29 13:43:06 UTC (rev 127613)
@@ -58,7 +58,7 @@
       'Products.ZCTextIndex',
       'Record',
       'RestrictedPython',
-      'ZConfig',
+      'ZConfig >= 2.9.2',
       'ZODB3',
       'ZopeUndo',
       'docutils',

Modified: Zope/trunk/src/Zope2/Startup/tests/testStarter.py
===================================================================
--- Zope/trunk/src/Zope2/Startup/tests/testStarter.py	2012-08-29 13:43:01 UTC (rev 127612)
+++ Zope/trunk/src/Zope2/Startup/tests/testStarter.py	2012-08-29 13:43:06 UTC (rev 127613)
@@ -23,9 +23,9 @@
 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 @@
                            '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 @@
         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'):