[Checkins]
SVN: Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/doctesting.py
Factor out a base class for doctestsetups.
Uli Fouquet
uli at gnufix.de
Sun Feb 10 08:43:40 EST 2008
Log message for revision 83734:
Factor out a base class for doctestsetups.
Changed:
U Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/doctesting.py
-=-
Modified: Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/doctesting.py
===================================================================
--- Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/doctesting.py 2008-02-10 13:43:09 UTC (rev 83733)
+++ Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/doctesting.py 2008-02-10 13:43:40 UTC (rev 83734)
@@ -22,7 +22,30 @@
from z3c.testsetup.base import BasicTestSetup
from z3c.testsetup.util import get_package
-class UnitDocTestSetup(BasicTestSetup):
+class DocTestSetup(BasicTestSetup):
+ """A test setup for doctests."""
+
+ globs = {}
+
+ optionflags = (doctest.ELLIPSIS+
+ doctest.NORMALIZE_WHITESPACE+
+ doctest.REPORT_NDIFF)
+
+ encoding = 'utf-8'
+
+ def __init__(self, package, setup=None, teardown=None, globs=None,
+ optionflags=None, encoding=None, **kw):
+ BasicTestSetup.__init__(self, package, **kw)
+ self.setUp = setup or self.setUp
+ self.tearDown = teardown or self.tearDown
+ self.encoding = encoding or self.encoding
+ if globs is not None:
+ self.globs = globs
+ if optionflags is not None:
+ self.optionflags = optionflags
+
+
+class UnitDocTestSetup(DocTestSetup):
"""A unit test setup for packages.
A collection of methods to search for appropriate doctest files in
@@ -48,6 +71,9 @@
globs = dict()
+ def setUp(self, test):
+ pass
+
def tearDown(self, test):
cleanup.cleanUp()
@@ -73,7 +99,7 @@
return suite
-class FunctionalDocTestSetup(BasicTestSetup):
+class FunctionalDocTestSetup(DocTestSetup):
"""A functional test setup for packages.
A collection of methods to search for appropriate doctest files in
@@ -110,15 +136,10 @@
'zcml_config', 'layer_name',
'layer', 'encoding']
- def __init__(self, package, filter_func=None, extensions=None,
- regexp_list=None, globs=None, setup=None, teardown=None,
- optionflags=None, checker=None, zcml_config = None,
- layer_name='FunctionalLayer', layer=None, encoding='utf-8',
- **kw):
- BasicTestSetup.__init__(self, package, filter_func=filter_func,
- extensions=extensions)
+ def __init__(self, package, checker=None, zcml_config = None,
+ layer_name='FunctionalLayer', layer=None, **kw):
+ DocTestSetup.__init__(self, package, **kw)
self.checker = checker
- self.encoding = encoding
# Setup a new layer if specified in params...
if zcml_config is not None and layer is None:
if not os.path.isfile(zcml_config):
More information about the Checkins
mailing list