[Checkins] SVN: z3c.testsetup/trunk/src/z3c/testsetup/functional/doctesting.py Support explicit layer declarations in functional tests.

[Uli Fouquet]

Log message for revision 88865:
  Support explicit layer declarations in functional tests.

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

-=-
Modified: z3c.testsetup/trunk/src/z3c/testsetup/functional/doctesting.py
===================================================================
--- z3c.testsetup/trunk/src/z3c/testsetup/functional/doctesting.py	2008-07-28 14:42:47 UTC (rev 88864)
+++ z3c.testsetup/trunk/src/z3c/testsetup/functional/doctesting.py	2008-07-28 14:45:19 UTC (rev 88865)
@@ -20,7 +20,7 @@
     HTTPCaller, getRootFolder, sync, ZCMLLayer, FunctionalDocFileSuite,
     FunctionalTestSetup)
 from z3c.testsetup.doctesting import DocTestSetup
-from z3c.testsetup.util import get_package
+from z3c.testsetup.util import get_package, get_marker_from_file
 
 class FunctionalDocTestSetup(DocTestSetup):
     """A functional test setup for packages.
@@ -87,6 +87,7 @@
 
     def suiteFromFile(self, name):
         suite = unittest.TestSuite()
+        layer = 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])
@@ -101,6 +102,8 @@
             **self.additional_options
             )
         test.layer = self.layer
+        if layer is not None:
+            test.layer = layer
         suite.addTest(test)
         return suite