[Checkins] SVN: zope.app.testing/trunk/src/zope/app/testing/functional.py add a helper to build functional tests from embedded docstrings

[Fred L. Drake, Jr.]

Log message for revision 75907:
  add a helper to build functional tests from embedded docstrings

Changed:
  U   zope.app.testing/trunk/src/zope/app/testing/functional.py

-=-
Modified: zope.app.testing/trunk/src/zope/app/testing/functional.py
===================================================================
--- zope.app.testing/trunk/src/zope/app/testing/functional.py	2007-05-23 14:22:15 UTC (rev 75906)
+++ zope.app.testing/trunk/src/zope/app/testing/functional.py	2007-05-23 14:23:02 UTC (rev 75907)
@@ -709,13 +709,28 @@
 
 
 def FunctionalDocFileSuite(*paths, **kw):
+    """Build a functional test suite from a text file."""
+    kw['package'] = doctest._normalize_module(kw.get('package'))
+    _prepare_doctest_keywords(kw)
+    suite = doctest.DocFileSuite(*paths, **kw)
+    suite.layer = Functional
+    return suite
+
+
+def FunctionalDocTestSuite(*paths, **kw):
+    """Build a functional test suite from docstrings in a module."""
+    _prepare_doctest_keywords(kw)
+    suite = doctest.DocTestSuite(*paths, **kw)
+    suite.layer = Functional
+    return suite
+
+
+def _prepare_doctest_keywords(kw):
     globs = kw.setdefault('globs', {})
     globs['http'] = HTTPCaller()
     globs['getRootFolder'] = getRootFolder
     globs['sync'] = sync
 
-    kw['package'] = doctest._normalize_module(kw.get('package'))
-
     kwsetUp = kw.get('setUp')
     def setUp(test):
         FunctionalTestSetup().setUp()
@@ -739,10 +754,6 @@
                              | doctest.REPORT_NDIFF
                              | doctest.NORMALIZE_WHITESPACE)
 
-    suite = doctest.DocFileSuite(*paths, **kw)
-    suite.layer = Functional
-    return suite
 
-
 if __name__ == '__main__':
     unittest.main()