Use doctest instead of zope.testing.doctest and adapt test to changes…

… in Five
plone · Jan 29, 2016 · e4674df · e4674df
1 parent 927fb26
commit e4674df
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -12,6 +12,8 @@ Fixes:
 
 - Fix ajax selection for add forms
   [tomgross]
+- Use doctest instead of zope.testing.doctest
+  [pbauer]
 
 
 1.1.8 (2016-01-08)

diff --git a/plone/app/z3cform/inline_validation.rst b/plone/app/z3cform/inline_validation.rst
@@ -67,7 +67,7 @@ Let's verify that worked:
     >>> context._REQUEST = request # evil test fake
     >>> formWrapper = getMultiAdapter((context, request), name=u"test-form")
     >>> formWrapper
-    <Products.Five.metaclass.MyFormWrapper object ...>
+    <Products.Five.browser.metaconfigure.MyFormWrapper object ...>
     >>> formWrapper.form
     <class 'plone.app.z3cform.tests.example.MyForm'>
 

diff --git a/plone/app/z3cform/tests/tests.py b/plone/app/z3cform/tests/tests.py
@@ -2,9 +2,9 @@
 from plone.browserlayer.layer import mark_layer
 from zope.traversing.interfaces import BeforeTraverseEvent
 
+import doctest
 import unittest
 import zope.component.testing
-import zope.testing.doctest
 
 ROBOT_TEST_LEVEL = 5
 
@@ -36,31 +36,31 @@ def test_content_provider(self):
 
 def test_suite():
 
-    inlineValidationTests = zope.testing.doctest.DocFileSuite(
+    inlineValidationTests = doctest.DocFileSuite(
         'inline_validation.rst',
         package='plone.app.z3cform',
         optionflags=(
-            zope.testing.doctest.ELLIPSIS |
-            zope.testing.doctest.NORMALIZE_WHITESPACE
+            doctest.ELLIPSIS |
+            doctest.NORMALIZE_WHITESPACE
         )
     )
     inlineValidationTests.layer = PAZ3CForm_INTEGRATION_TESTING
 
     suite = unittest.TestSuite([
         unittest.makeSuite(IntegrationTests),
-        zope.testing.doctest.DocFileSuite(
+        doctest.DocFileSuite(
             'wysiwyg/README.rst',
             package='plone.app.z3cform',
             setUp=zope.component.testing.setUp,
             tearDown=zope.component.testing.tearDown,
         ),
-        zope.testing.doctest.DocFileSuite(
+        doctest.DocFileSuite(
             'queryselect/README.rst',
             package='plone.app.z3cform',
             setUp=zope.component.testing.setUp,
             tearDown=zope.component.testing.tearDown,
         ),
-        zope.testing.doctest.DocTestSuite(
+        doctest.DocTestSuite(
             'plone.app.z3cform.wysiwyg.widget',
             package='plone.app.z3cform',
             setUp=zope.component.testing.setUp,