[Checkins] SVN: z3c.testsetup/trunk/src/z3c/testsetup/doctesting.py Add support for layers in unit doctests.

Uli Fouquet uli at gnufix.de
Mon Jul 28 06:50:14 EDT 2008


Log message for revision 88855:
  Add support for layers in unit doctests.

Changed:
  U   z3c.testsetup/trunk/src/z3c/testsetup/doctesting.py

-=-
Modified: z3c.testsetup/trunk/src/z3c/testsetup/doctesting.py
===================================================================
--- z3c.testsetup/trunk/src/z3c/testsetup/doctesting.py	2008-07-28 10:49:02 UTC (rev 88854)
+++ z3c.testsetup/trunk/src/z3c/testsetup/doctesting.py	2008-07-28 10:50:13 UTC (rev 88855)
@@ -17,7 +17,7 @@
 import os.path
 from zope.testing import doctest, cleanup
 from z3c.testsetup.base import BasicTestSetup
-from z3c.testsetup.util import get_package
+from z3c.testsetup.util import get_package, get_marker_from_file
 
 class DocTestSetup(BasicTestSetup):
     """A test setup for doctests."""
@@ -78,13 +78,13 @@
         docfiles = self.getDocTestFiles(package=self.package)
         suite = unittest.TestSuite()
         for name in docfiles:
+            layerdef = get_marker_from_file('Test-Layerdef', name)
             if os.path.isabs(name):
                 # We get absolute pathnames, but we need relative ones...
                 common_prefix = os.path.commonprefix([self.package.__file__,
                                                       name])
                 name = name[len(common_prefix):]
-            suite.addTest(
-                doctest.DocFileSuite(
+            test = doctest.DocFileSuite(
                 name,
                 package=self.package,
                 setUp=self.setUp,
@@ -92,6 +92,8 @@
                 globs=self.globs,
                 optionflags=self.optionflags,
                 **self.additional_options
-                ))
+                )
+            if layerdef is not None:
+                test.layer = layerdef
+            suite.addTest(test)
         return suite
-



More information about the Checkins mailing list