[Zope-Checkins] CVS: Zope/lib/python/Zope/Startup/tests - testStarter.py:1.18

[Fred L. Drake, Jr.]

Update of /cvs-repository/Zope/lib/python/Zope/Startup/tests
In directory cvs.zope.org:/tmp/cvs-serv28349/lib/python/Zope/Startup/tests

Modified Files:
	testStarter.py 
Log Message:
cleanly separate the debug logging handler from the startup logging handler;
these must be controllable separately


=== Zope/lib/python/Zope/Startup/tests/testStarter.py 1.17 => 1.18 ===
--- Zope/lib/python/Zope/Startup/tests/testStarter.py:1.17	Fri Apr 16 11:35:23 2004
+++ Zope/lib/python/Zope/Startup/tests/testStarter.py	Thu Apr 22 16:20:12 2004
@@ -21,6 +21,8 @@
 import unittest
 
 import ZConfig
+from ZConfig.components.logger.tests import test_logger
+
 import Zope.Startup
 from Zope.Startup import handlers
 from Zope.Startup import ZopeStarter, UnixZopeStarter
@@ -39,18 +41,18 @@
 # that come later
 
 logger_states = {}
-for name in ('event', 'trace', 'access'):
+for name in (None, 'trace', 'access'):
     logger = logging.getLogger(name)
     logger_states[name] = {'level':logger.level,
                            'propagate':logger.propagate,
                            'handlers':logger.handlers,
                            'filters':logger.filters}
 
-class ZopeStarterTestCase(unittest.TestCase):
+class ZopeStarterTestCase(test_logger.LoggingTestBase):
 
     def setUp(self):
         self.schema = getSchema()
-        self.original_event_logger = logging.getLogger
+        test_logger.LoggingTestBase.setUp(self)
 
     def tearDown(self):
         try:
@@ -58,8 +60,9 @@
             os.rmdir(TEMPNAME)
         except:
             pass
+        test_logger.LoggingTestBase.tearDown(self)
         # reset logger states
-        for name in ('event', 'access', 'trace'):
+        for name in (None, 'access', 'trace'):
             logger = logging.getLogger(name)
             logger.__dict__.update(logger_states[name])
 
@@ -126,10 +129,14 @@
         # with the lowest level
         logger = logging.getLogger()
         self.assertEqual(starter.startup_handler.level, 15) # 15 is BLATHER
-        self.assertEqual(starter.startup_handler, logger.handlers[0])
+        self.assert_(starter.startup_handler in logger.handlers)
         self.assertEqual(logger.level, 15)
-        self.assertEqual(len(logger.handlers), 1)
-        self.failUnlessEqual(starter.startup_handler.stream, sys.stderr)
+        # We expect a debug handler and the startup handler:
+        self.assertEqual(len(logger.handlers), 2)
+        # XXX need to check that log messages get written to
+        # sys.stderr, not that the stream identity for the startup
+        # handler matches
+        #self.failUnlessEqual(starter.startup_handler.stream, sys.stderr)
         conf = self.load_config_text("""
             instancehome <<INSTANCE_HOME>>
             debug-mode off
@@ -142,7 +149,10 @@
            </eventlog>""")
         starter = UnixZopeStarter(conf)
         starter.setupInitialLogging()
-        self.failIfEqual(starter.startup_handler.stream, sys.stderr)
+        # XXX need to check that log messages get written to
+        # sys.stderr, not that the stream identity for the startup
+        # handler matches
+        #self.failIfEqual(starter.startup_handler.stream, sys.stderr)
 
     def testSetupZServerThreads(self):
         conf = self.load_config_text("""