[Checkins] SVN: grokcore.formlib/trunk/ Update functional tests to use zope.app.wsgi instead of zope.app.testing.
Sylvain Viollon
sylvain at infrae.com
Wed Apr 14 08:30:13 EDT 2010
Log message for revision 110864:
Update functional tests to use zope.app.wsgi instead of zope.app.testing.
Changed:
U grokcore.formlib/trunk/CHANGES.txt
U grokcore.formlib/trunk/setup.py
U grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/actions.py
U grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/addform.py
U grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/addform_applydata.py
U grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/editform_applydata.py
U grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/editform_applydata_schema.py
U grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/editform_applydata_schemafields.py
U grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/form.py
U grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/update.py
U grokcore.formlib/trunk/src/grokcore/formlib/ftests/test_functional.py
-=-
Modified: grokcore.formlib/trunk/CHANGES.txt
===================================================================
--- grokcore.formlib/trunk/CHANGES.txt 2010-04-14 12:30:07 UTC (rev 110863)
+++ grokcore.formlib/trunk/CHANGES.txt 2010-04-14 12:30:12 UTC (rev 110864)
@@ -4,9 +4,9 @@
1.6 (unreleased)
----------------
-- Nothing changed yet.
+- Update functional tests to zope.app.wsgi Browser instead of zope.app.testing
+ one.
-
1.5 (2009-12-13)
----------------
Modified: grokcore.formlib/trunk/setup.py
===================================================================
--- grokcore.formlib/trunk/setup.py 2010-04-14 12:30:07 UTC (rev 110863)
+++ grokcore.formlib/trunk/setup.py 2010-04-14 12:30:12 UTC (rev 110864)
@@ -11,7 +11,7 @@
)
tests_require = [
- 'zope.app.testing',
+ 'zope.app.wsgi',
'zope.app.zcmlfiles',
'zope.component',
'zope.configuration',
Modified: grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/actions.py
===================================================================
--- grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/actions.py 2010-04-14 12:30:07 UTC (rev 110863)
+++ grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/actions.py 2010-04-14 12:30:12 UTC (rev 110864)
@@ -6,7 +6,7 @@
>>> getRootFolder()["manfred"] = Mammoth()
- >>> from zope.testbrowser.testing import Browser
+ >>> from zope.app.wsgi.testlayer import Browser
>>> browser = Browser()
>>> browser.handleErrors = False
>>> browser.open("http://localhost/manfred/@@edit")
Modified: grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/addform.py
===================================================================
--- grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/addform.py 2010-04-14 12:30:07 UTC (rev 110863)
+++ grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/addform.py 2010-04-14 12:30:12 UTC (rev 110864)
@@ -3,7 +3,7 @@
>>> getRootFolder()["zoo"] = Zoo()
- >>> from zope.testbrowser.testing import Browser
+ >>> from zope.app.wsgi.testlayer import Browser
>>> browser = Browser()
>>> browser.handleErrors = False
Modified: grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/addform_applydata.py
===================================================================
--- grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/addform_applydata.py 2010-04-14 12:30:07 UTC (rev 110863)
+++ grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/addform_applydata.py 2010-04-14 12:30:12 UTC (rev 110864)
@@ -5,7 +5,7 @@
>>> getRootFolder()["zoo"] = Zoo()
- >>> from zope.testbrowser.testing import Browser
+ >>> from zope.app.wsgi.testlayer import Browser
>>> browser = Browser()
>>> browser.handleErrors = False
Modified: grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/editform_applydata.py
===================================================================
--- grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/editform_applydata.py 2010-04-14 12:30:07 UTC (rev 110863)
+++ grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/editform_applydata.py 2010-04-14 12:30:12 UTC (rev 110864)
@@ -5,7 +5,7 @@
>>> getRootFolder()["manfred"] = Mammoth('Manfred the Mammoth', 'Really big')
- >>> from zope.testbrowser.testing import Browser
+ >>> from zope.app.wsgi.testlayer import Browser
>>> browser = Browser()
>>> browser.handleErrors = False
Modified: grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/editform_applydata_schema.py
===================================================================
--- grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/editform_applydata_schema.py 2010-04-14 12:30:07 UTC (rev 110863)
+++ grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/editform_applydata_schema.py 2010-04-14 12:30:12 UTC (rev 110864)
@@ -8,7 +8,7 @@
>>> getRootFolder()["manfred"] = Mammoth('Manfred the Mammoth', 'Really big')
- >>> from zope.testbrowser.testing import Browser
+ >>> from zope.app.wsgi.testlayer import Browser
>>> browser = Browser()
>>> browser.handleErrors = False
Modified: grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/editform_applydata_schemafields.py
===================================================================
--- grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/editform_applydata_schemafields.py 2010-04-14 12:30:07 UTC (rev 110863)
+++ grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/editform_applydata_schemafields.py 2010-04-14 12:30:12 UTC (rev 110864)
@@ -11,7 +11,7 @@
>>> mammoth.name = 'Manfred the Mammoth'
>>> mammoth.size = 'Really big'
- >>> from zope.testbrowser.testing import Browser
+ >>> from zope.app.wsgi.testlayer import Browser
>>> browser = Browser()
>>> browser.handleErrors = False
Modified: grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/form.py
===================================================================
--- grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/form.py 2010-04-14 12:30:07 UTC (rev 110863)
+++ grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/form.py 2010-04-14 12:30:12 UTC (rev 110864)
@@ -3,7 +3,7 @@
>>> getRootFolder()["manfred"] = Mammoth()
- >>> from zope.testbrowser.testing import Browser
+ >>> from zope.app.wsgi.testlayer import Browser
>>> browser = Browser()
>>> browser.handleErrors = False
>>> browser.open("http://localhost/manfred/@@edit")
Modified: grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/update.py
===================================================================
--- grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/update.py 2010-04-14 12:30:07 UTC (rev 110863)
+++ grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/update.py 2010-04-14 12:30:12 UTC (rev 110864)
@@ -4,7 +4,7 @@
>>> getRootFolder()["manfred"] = Mammoth()
- >>> from zope.testbrowser.testing import Browser
+ >>> from zope.app.wsgi.testlayer import Browser
>>> browser = Browser()
>>> browser.handleErrors = False
>>> browser.open("http://localhost/manfred/edit")
Modified: grokcore.formlib/trunk/src/grokcore/formlib/ftests/test_functional.py
===================================================================
--- grokcore.formlib/trunk/src/grokcore/formlib/ftests/test_functional.py 2010-04-14 12:30:07 UTC (rev 110863)
+++ grokcore.formlib/trunk/src/grokcore/formlib/ftests/test_functional.py 2010-04-14 12:30:12 UTC (rev 110864)
@@ -1,29 +1,19 @@
import re
import unittest
import grokcore.formlib
-import os.path
from pkg_resources import resource_listdir
from zope.testing import doctest, renormalizing
-from zope.app.testing.functional import (getRootFolder, FunctionalTestSetup,
- ZCMLLayer)
+from zope.app.wsgi.testlayer import BrowserLayer
-ftesting_zcml = os.path.join(os.path.dirname(grokcore.formlib.__file__),
- 'ftesting.zcml')
-FunctionalLayer = ZCMLLayer(ftesting_zcml, __name__, 'FunctionalLayer',
- allow_teardown=True)
+FunctionalLayer = BrowserLayer(grokcore.formlib)
-def setUp(test):
- FunctionalTestSetup().setUp()
-
-def tearDown(test):
- FunctionalTestSetup().tearDown()
-
checker = renormalizing.RENormalizing([
# Accommodate to exception wrapping in newer versions of mechanize
(re.compile(r'httperror_seek_wrapper:', re.M), 'HTTPError:'),
])
+
def suiteFromPackage(name):
files = resource_listdir(__name__, name)
suite = unittest.TestSuite()
@@ -35,9 +25,9 @@
dottedname = 'grokcore.formlib.ftests.%s.%s' % (name, filename[:-3])
test = doctest.DocTestSuite(
- dottedname, setUp=setUp, tearDown=tearDown,
+ dottedname,
checker=checker,
- extraglobs=dict(getRootFolder=getRootFolder),
+ extraglobs=dict(getRootFolder=FunctionalLayer.getRootFolder),
optionflags=(doctest.ELLIPSIS+
doctest.NORMALIZE_WHITESPACE+
doctest.REPORT_NDIFF)
More information about the checkins
mailing list