Log message for revision 76990: Provide access to test globs in doctest setUp and tearDown.
Changed: U Zope/branches/2.10/lib/python/Testing/ZopeTestCase/doc/CHANGES.txt U Zope/branches/2.10/lib/python/Testing/ZopeTestCase/zopedoctest/functional.py U Zope/branches/2.10/lib/python/Testing/ZopeTestCase/zopedoctest/testFunctionalDocTest.py U Zope/branches/2.10/lib/python/Testing/ZopeTestCase/zopedoctest/testZopeDocTest.py -=- Modified: Zope/branches/2.10/lib/python/Testing/ZopeTestCase/doc/CHANGES.txt =================================================================== --- Zope/branches/2.10/lib/python/Testing/ZopeTestCase/doc/CHANGES.txt 2007-06-23 17:08:16 UTC (rev 76989) +++ Zope/branches/2.10/lib/python/Testing/ZopeTestCase/doc/CHANGES.txt 2007-06-23 17:08:40 UTC (rev 76990) @@ -16,6 +16,7 @@ Thanks to Whit Morris. - Added hasPackage and installPackage functions for dealing with "products" registered via five:registerPackage. +- Provide access to test globs in doctest setUp and tearDown. 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/zopedoctest/functional.py =================================================================== --- Zope/branches/2.10/lib/python/Testing/ZopeTestCase/zopedoctest/functional.py 2007-06-23 17:08:16 UTC (rev 76989) +++ Zope/branches/2.10/lib/python/Testing/ZopeTestCase/zopedoctest/functional.py 2007-06-23 17:08:40 UTC (rev 76990) @@ -253,6 +253,7 @@ if hasattr(test_instance, 'portal'): test.globs['portal'] = test_instance.portal test.globs['portal_name'] = test_instance.portal.getId() + test_instance.globs = test.globs if kwsetUp is not None: kwsetUp(test_instance) Modified: Zope/branches/2.10/lib/python/Testing/ZopeTestCase/zopedoctest/testFunctionalDocTest.py =================================================================== --- Zope/branches/2.10/lib/python/Testing/ZopeTestCase/zopedoctest/testFunctionalDocTest.py 2007-06-23 17:08:16 UTC (rev 76989) +++ Zope/branches/2.10/lib/python/Testing/ZopeTestCase/zopedoctest/testFunctionalDocTest.py 2007-06-23 17:08:40 UTC (rev 76990) @@ -38,6 +38,9 @@ Content-Type: text/plain; charset=... <BLANKLINE> index + + >>> foo + 1 ''' self.folder.addDTMLDocument('index_html', file='index') @@ -55,7 +58,9 @@ </dtml-in>''' self.folder.addDTMLMethod('show_cookies', file=show_cookies) + self.globs['foo'] = 1 + def test_suite(): return TestSuite(( FunctionalDocTestSuite(setUp=setUp), Modified: Zope/branches/2.10/lib/python/Testing/ZopeTestCase/zopedoctest/testZopeDocTest.py =================================================================== --- Zope/branches/2.10/lib/python/Testing/ZopeTestCase/zopedoctest/testZopeDocTest.py 2007-06-23 17:08:16 UTC (rev 76989) +++ Zope/branches/2.10/lib/python/Testing/ZopeTestCase/zopedoctest/testZopeDocTest.py 2007-06-23 17:08:40 UTC (rev 76990) @@ -12,7 +12,7 @@ ############################################################################## """Example Zope doctest -$Id: testZopeDocTest.py,v 1.2 2005/03/26 18:07:08 shh42 Exp $ +$Id$ """ import os, sys @@ -29,8 +29,12 @@ >>> 'object' in folder.objectIds() True + + >>> foo + 1 ''' self.folder.manage_addFolder('object', '') + self.globs['foo'] = 1 def test_suite(): _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins