[Zope-Checkins] SVN: Zope/branches/2.9/lib/python/Testing/ZopeTestCase/ Catch up with standalone ZTC.
Log message for revision 70055: Catch up with standalone ZTC. Changed: U Zope/branches/2.9/lib/python/Testing/ZopeTestCase/doc/CHANGES.txt U Zope/branches/2.9/lib/python/Testing/ZopeTestCase/ztc_common.py -=- Modified: Zope/branches/2.9/lib/python/Testing/ZopeTestCase/doc/CHANGES.txt === --- Zope/branches/2.9/lib/python/Testing/ZopeTestCase/doc/CHANGES.txt 2006-09-08 14:00:05 UTC (rev 70054) +++ Zope/branches/2.9/lib/python/Testing/ZopeTestCase/doc/CHANGES.txt 2006-09-08 14:00:15 UTC (rev 70055) @@ -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.9/lib/python/Testing/ZopeTestCase/ztc_common.py === --- Zope/branches/2.9/lib/python/Testing/ZopeTestCase/ztc_common.py 2006-09-08 14:00:05 UTC (rev 70054) +++ Zope/branches/2.9/lib/python/Testing/ZopeTestCase/ztc_common.py 2006-09-08 14:00:15 UTC (rev 70055) @@ -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 ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.9/lib/python/Testing/ZopeTestCase/ Catch up with standalone ZTC.
Log message for revision 66172: Catch up with standalone ZTC. Changed: U Zope/branches/2.9/lib/python/Testing/ZopeTestCase/ZopeLite.py U Zope/branches/2.9/lib/python/Testing/ZopeTestCase/doc/CHANGES.txt U Zope/branches/2.9/lib/python/Testing/ZopeTestCase/utils.py -=- Modified: Zope/branches/2.9/lib/python/Testing/ZopeTestCase/ZopeLite.py === --- Zope/branches/2.9/lib/python/Testing/ZopeTestCase/ZopeLite.py 2006-03-26 15:14:34 UTC (rev 66171) +++ Zope/branches/2.9/lib/python/Testing/ZopeTestCase/ZopeLite.py 2006-03-26 15:15:41 UTC (rev 66172) @@ -61,6 +61,9 @@ import logging root = logging.getLogger() if not root.handlers: +class NullHandler(logging.Handler): +def emit(self, record): pass +root.addHandler(NullHandler()) logging.basicConfig() def _configure_debug_mode(): Modified: Zope/branches/2.9/lib/python/Testing/ZopeTestCase/doc/CHANGES.txt === --- Zope/branches/2.9/lib/python/Testing/ZopeTestCase/doc/CHANGES.txt 2006-03-26 15:14:34 UTC (rev 66171) +++ Zope/branches/2.9/lib/python/Testing/ZopeTestCase/doc/CHANGES.txt 2006-03-26 15:15:41 UTC (rev 66172) @@ -5,7 +5,7 @@ than GET or HEAD while omitting the stdin argument. - installProduct() now becomes a noop if ZopeTestCase did not apply its patches. -- Made the functional doctests set the cookie related headers. +- 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. Modified: Zope/branches/2.9/lib/python/Testing/ZopeTestCase/utils.py === --- Zope/branches/2.9/lib/python/Testing/ZopeTestCase/utils.py 2006-03-26 15:14:34 UTC (rev 66171) +++ Zope/branches/2.9/lib/python/Testing/ZopeTestCase/utils.py 2006-03-26 15:15:41 UTC (rev 66172) @@ -173,5 +173,7 @@ 'startZServer', 'importObjectFromFile', 'appcall', +'makerequest', +'makelist', ] ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins