Commit 37923b51 authored by Stefan H. Holek's avatar Stefan H. Holek

Provide access to test globs in doctest setUp and tearDown.

parent 4553e448
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
- Added placeless.py for Z3-style setup. Thanks to Whit Morriss. - Added placeless.py for Z3-style setup. Thanks to Whit Morriss.
- Fixed functional.http() to only pass the request body (no headers) to - Fixed functional.http() to only pass the request body (no headers) to
publish_module(). Thanks to Andreas Zeidler. publish_module(). Thanks to Andreas Zeidler.
- Provide access to test globs in doctest setUp and tearDown.
0.9.8 (Zope 2.8 edition) 0.9.8 (Zope 2.8 edition)
- Renamed 'doctest' package to 'zopedoctest' because of name-shadowing - Renamed 'doctest' package to 'zopedoctest' because of name-shadowing
......
...@@ -249,6 +249,7 @@ class ZopeSuiteFactory: ...@@ -249,6 +249,7 @@ class ZopeSuiteFactory:
if hasattr(test_instance, 'portal'): if hasattr(test_instance, 'portal'):
test.globs['portal'] = test_instance.portal test.globs['portal'] = test_instance.portal
test.globs['portal_name'] = test_instance.portal.getId() test.globs['portal_name'] = test_instance.portal.getId()
test_instance.globs = test.globs
if kwsetUp is not None: if kwsetUp is not None:
kwsetUp(test_instance) kwsetUp(test_instance)
......
...@@ -38,6 +38,9 @@ def setUp(self): ...@@ -38,6 +38,9 @@ def setUp(self):
Content-Type: text/plain Content-Type: text/plain
<BLANKLINE> <BLANKLINE>
index index
>>> foo
1
''' '''
self.folder.addDTMLDocument('index_html', file='index') self.folder.addDTMLDocument('index_html', file='index')
...@@ -55,6 +58,8 @@ def setUp(self): ...@@ -55,6 +58,8 @@ def setUp(self):
</dtml-in>''' </dtml-in>'''
self.folder.addDTMLMethod('show_cookies', file=show_cookies) self.folder.addDTMLMethod('show_cookies', file=show_cookies)
self.globs['foo'] = 1
def test_suite(): def test_suite():
return TestSuite(( return TestSuite((
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
############################################################################## ##############################################################################
"""Example Zope doctest """Example Zope doctest
$Id: testZopeDocTest.py,v 1.2 2005/03/26 18:07:08 shh42 Exp $ $Id$
""" """
import os, sys import os, sys
...@@ -29,8 +29,12 @@ def setUp(self): ...@@ -29,8 +29,12 @@ def setUp(self):
>>> 'object' in folder.objectIds() >>> 'object' in folder.objectIds()
True True
>>> foo
1
''' '''
self.folder.manage_addFolder('object', '') self.folder.manage_addFolder('object', '')
self.globs['foo'] = 1
def test_suite(): def test_suite():
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment