[Zope-Checkins] SVN: Zope/branches/2.10/lib/python/Testing/ZopeTestCase/ Catch up with standalone ZTC.

[Stefan H. Holek]

Log message for revision 70056:
  Catch up with standalone ZTC.
  

Changed:
  U   Zope/branches/2.10/lib/python/Testing/ZopeTestCase/doc/CHANGES.txt
  U   Zope/branches/2.10/lib/python/Testing/ZopeTestCase/ztc_common.py

-=-
Modified: Zope/branches/2.10/lib/python/Testing/ZopeTestCase/doc/CHANGES.txt
===================================================================
--- Zope/branches/2.10/lib/python/Testing/ZopeTestCase/doc/CHANGES.txt	2006-09-08 14:00:15 UTC (rev 70055)
+++ Zope/branches/2.10/lib/python/Testing/ZopeTestCase/doc/CHANGES.txt	2006-09-08 14:00:27 UTC (rev 70056)
@@ -7,11 +7,11 @@
   patches.
 - Made functional doctests set cookie related headers.
 - Made functional doctests set the Www-Authenticate header.
-- Made sure logging is configured. Read $INSTANCE_HOME/log.ini if it exists.
+- Made sure logging is configured.
 - Made base.TestCase a new-style class.
 - Added placeless.py for Z3-style setup. Thanks to Whit Morriss.
-- Fixed functional.http to only pass the request body (no headers) to
-  publish_module. Thanks to Andreas Zeidler.
+- Fixed functional.http() to only pass the request body (no headers) to
+  publish_module(). Thanks to Andreas Zeidler.
 
 0.9.8 (Zope 2.8 edition)
 - Renamed 'doctest' package to 'zopedoctest' because of name-shadowing

Modified: Zope/branches/2.10/lib/python/Testing/ZopeTestCase/ztc_common.py
===================================================================
--- Zope/branches/2.10/lib/python/Testing/ZopeTestCase/ztc_common.py	2006-09-08 14:00:15 UTC (rev 70055)
+++ Zope/branches/2.10/lib/python/Testing/ZopeTestCase/ztc_common.py	2006-09-08 14:00:27 UTC (rev 70056)
@@ -62,13 +62,11 @@
             return
         if self.zeo_instance_home:
             self.setup_zeo_instance_home()
-            self.setup_logging()
         else:
             if self.instance_home:
                 self.setup_instance_home()
             else:
                 self.detect_and_setup_instance_home()
-            self.setup_logging()
             self.setup_custom_zodb()
     
     def setup_zeo_instance_home(self):
@@ -130,13 +128,6 @@
                 os.environ['INSTANCE_HOME'] = INSTANCE_HOME = self.cwd
                 self.setconfig(instancehome=self.cwd)
 
-    def setup_logging(self):
-        '''If $INSTANCE_HOME/log.ini exists, load it.'''
-        logini = os.path.join(self.getconfig('instancehome'), 'log.ini')
-        if os.path.exists(logini):
-            import logging.config
-            logging.config.fileConfig(logini)
-
     def add_instance(self, p):
         '''Adds an INSTANCE_HOME directory to Products.__path__ and sys.path.'''
         import Products