[Checkins] SVN: grokcore.view/trunk/ Merge changes from ulif-zawsgi_ftests back into trunk. ftests now work again without using z.a.testing.
Uli Fouquet
uli at gnufix.de
Tue May 25 12:13:29 EDT 2010
Log message for revision 112706:
Merge changes from ulif-zawsgi_ftests back into trunk. ftests now work again without using z.a.testing.
Changed:
U grokcore.view/trunk/buildout.cfg
U grokcore.view/trunk/setup.py
U grokcore.view/trunk/src/grokcore/view/ftests/directoryresource/dirresource.py
U grokcore.view/trunk/src/grokcore/view/ftests/staticdir/simple.py
U grokcore.view/trunk/src/grokcore/view/ftests/test_functional.py
U grokcore.view/trunk/src/grokcore/view/ftests/url/redirect.py
U grokcore.view/trunk/src/grokcore/view/ftests/url/url.py
U grokcore.view/trunk/src/grokcore/view/ftests/url/url_function.py
U grokcore.view/trunk/src/grokcore/view/ftests/view/argument.py
U grokcore.view/trunk/src/grokcore/view/ftests/view/index.py
U grokcore.view/trunk/src/grokcore/view/ftests/view/macros.py
U grokcore.view/trunk/src/grokcore/view/ftests/view/require.py
U grokcore.view/trunk/src/grokcore/view/ftests/view/skindirective.py
U grokcore.view/trunk/src/grokcore/view/ftests/view/view.py
-=-
Modified: grokcore.view/trunk/buildout.cfg
===================================================================
--- grokcore.view/trunk/buildout.cfg 2010-05-25 16:03:15 UTC (rev 112705)
+++ grokcore.view/trunk/buildout.cfg 2010-05-25 16:13:29 UTC (rev 112706)
@@ -12,6 +12,7 @@
grokcore.view =
martian = 0.12
grokcore.component = 2.0
+zope.app.wsgi = 3.9.2
[interpreter]
Modified: grokcore.view/trunk/setup.py
===================================================================
--- grokcore.view/trunk/setup.py 2010-05-25 16:03:15 UTC (rev 112705)
+++ grokcore.view/trunk/setup.py 2010-05-25 16:13:29 UTC (rev 112706)
@@ -26,14 +26,12 @@
]
tests_require = [
- 'zope.app.testing',
+ 'zope.app.wsgi',
'zope.container',
'zope.securitypolicy',
'zope.site',
- 'zope.testbrowser',
'zope.testing',
'zope.login',
- 'zope.app.testing',
'zope.configuration',
'zope.app.appsetup',
'zope.app.publication',
Modified: grokcore.view/trunk/src/grokcore/view/ftests/directoryresource/dirresource.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/ftests/directoryresource/dirresource.py 2010-05-25 16:03:15 UTC (rev 112705)
+++ grokcore.view/trunk/src/grokcore/view/ftests/directoryresource/dirresource.py 2010-05-25 16:13:29 UTC (rev 112706)
@@ -3,7 +3,7 @@
through the dotted name of the module in which the directoryresource is
defined::
- >>> from zope.testbrowser.testing import Browser
+ >>> from zope.app.wsgi.testlayer import Browser
>>> browser = Browser()
>>> browser.handleErrors = False
>>> browser.open(
@@ -37,7 +37,7 @@
... 'anotherfile.txt')
Traceback (most recent call last):
...
- httperror_seek_wrapper: HTTP Error 404: Not Found
+ HTTPError: HTTP Error 404: Not Found
Directoryresources can be registered under an explicit name::
Modified: grokcore.view/trunk/src/grokcore/view/ftests/staticdir/simple.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/ftests/staticdir/simple.py 2010-05-25 16:03:15 UTC (rev 112705)
+++ grokcore.view/trunk/src/grokcore/view/ftests/staticdir/simple.py 2010-05-25 16:13:29 UTC (rev 112706)
@@ -2,7 +2,7 @@
If there is a static/ directory inside of a grokked package, its
contents will be available as static resources under a URL:
- >>> from zope.testbrowser.testing import Browser
+ >>> from zope.app.wsgi.testlayer import Browser
>>> browser = Browser()
>>> browser.handleErrors = False
>>> browser.open(
Modified: grokcore.view/trunk/src/grokcore/view/ftests/test_functional.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/ftests/test_functional.py 2010-05-25 16:03:15 UTC (rev 112705)
+++ grokcore.view/trunk/src/grokcore/view/ftests/test_functional.py 2010-05-25 16:13:29 UTC (rev 112706)
@@ -1,3 +1,4 @@
+import doctest
import re
import unittest
import os.path
@@ -4,21 +5,13 @@
import grokcore.view
from pkg_resources import resource_listdir
+
+from zope.app.wsgi.testlayer import BrowserLayer, http
from zope.testing import doctest, renormalizing
-from zope.app.testing.functional import (HTTPCaller, getRootFolder,
- FunctionalTestSetup, sync, ZCMLLayer)
-ftesting_zcml = os.path.join(os.path.dirname(grokcore.view.__file__),
- 'ftesting.zcml')
-FunctionalLayer = ZCMLLayer(ftesting_zcml, __name__, 'FunctionalLayer',
- allow_teardown=True)
-def setUp(test):
- FunctionalTestSetup().setUp()
+FunctionalLayer = BrowserLayer(grokcore.view)
-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:'),
@@ -27,6 +20,7 @@
def suiteFromPackage(name):
files = resource_listdir(__name__, name)
suite = unittest.TestSuite()
+ getRootFolder = FunctionalLayer.getRootFolder
for filename in files:
if not filename.endswith('.py'):
continue
@@ -35,14 +29,14 @@
dottedname = 'grokcore.view.ftests.%s.%s' % (name, filename[:-3])
test = doctest.DocTestSuite(
- dottedname, setUp=setUp, tearDown=tearDown,
+ dottedname,
checker=checker,
- extraglobs=dict(http=HTTPCaller(),
+ extraglobs=dict(http=http,
getRootFolder=getRootFolder,
- sync=sync),
+ ),
optionflags=(doctest.ELLIPSIS+
doctest.NORMALIZE_WHITESPACE+
- doctest.REPORT_NDIFF)
+ doctest.REPORT_NDIFF),
)
test.layer = FunctionalLayer
Modified: grokcore.view/trunk/src/grokcore/view/ftests/url/redirect.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/ftests/url/redirect.py 2010-05-25 16:03:15 UTC (rev 112705)
+++ grokcore.view/trunk/src/grokcore/view/ftests/url/redirect.py 2010-05-25 16:13:29 UTC (rev 112706)
@@ -6,7 +6,7 @@
Since the index view redirects to mammoth, we expect to see the URL
point to mammoth:
- >>> from zope.testbrowser.testing import Browser
+ >>> from zope.app.wsgi.testlayer import Browser
>>> browser = Browser()
>>> browser.handleErrors = False
>>> browser.open('http://localhost/manfred')
Modified: grokcore.view/trunk/src/grokcore/view/ftests/url/url.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/ftests/url/url.py 2010-05-25 16:03:15 UTC (rev 112705)
+++ grokcore.view/trunk/src/grokcore/view/ftests/url/url.py 2010-05-25 16:13:29 UTC (rev 112706)
@@ -10,7 +10,7 @@
The views in this test implement self.url():
- >>> from zope.testbrowser.testing import Browser
+ >>> from zope.app.wsgi.testlayer import Browser
>>> browser = Browser()
>>> browser.handleErrors = False
>>> browser.open("http://localhost/herd/manfred/index")
Modified: grokcore.view/trunk/src/grokcore/view/ftests/url/url_function.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/ftests/url/url_function.py 2010-05-25 16:03:15 UTC (rev 112705)
+++ grokcore.view/trunk/src/grokcore/view/ftests/url/url_function.py 2010-05-25 16:13:29 UTC (rev 112706)
@@ -13,7 +13,7 @@
Now let's use url on some things::
- >>> from zope.testbrowser.testing import Browser
+ >>> from zope.app.wsgi.testlayer import Browser
>>> browser = Browser()
>>> browser.handleErrors = False
>>> browser.open("http://localhost/herd/manfred/index")
Modified: grokcore.view/trunk/src/grokcore/view/ftests/view/argument.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/ftests/view/argument.py 2010-05-25 16:03:15 UTC (rev 112705)
+++ grokcore.view/trunk/src/grokcore/view/ftests/view/argument.py 2010-05-25 16:13:29 UTC (rev 112706)
@@ -1,7 +1,7 @@
"""
>>> getRootFolder()["manfred"] = Mammoth()
- >>> from zope.testbrowser.testing import Browser
+ >>> from zope.app.wsgi.testlayer import Browser
>>> browser = Browser()
>>> browser.handleErrors = False
Modified: grokcore.view/trunk/src/grokcore/view/ftests/view/index.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/ftests/view/index.py 2010-05-25 16:03:15 UTC (rev 112705)
+++ grokcore.view/trunk/src/grokcore/view/ftests/view/index.py 2010-05-25 16:13:29 UTC (rev 112706)
@@ -3,7 +3,7 @@
The default view name for a model is 'index':
- >>> from zope.testbrowser.testing import Browser
+ >>> from zope.app.wsgi.testlayer import Browser
>>> browser = Browser()
>>> browser.handleErrors = False
>>> browser.open("http://localhost/manfred")
Modified: grokcore.view/trunk/src/grokcore/view/ftests/view/macros.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/ftests/view/macros.py 2010-05-25 16:03:15 UTC (rev 112705)
+++ grokcore.view/trunk/src/grokcore/view/ftests/view/macros.py 2010-05-25 16:13:29 UTC (rev 112706)
@@ -1,7 +1,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/@@painting")
Modified: grokcore.view/trunk/src/grokcore/view/ftests/view/require.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/ftests/view/require.py 2010-05-25 16:03:15 UTC (rev 112705)
+++ grokcore.view/trunk/src/grokcore/view/ftests/view/require.py 2010-05-25 16:13:29 UTC (rev 112706)
@@ -2,7 +2,7 @@
Viewing a protected view with insufficient privileges will yield
Unauthorized:
- >>> from zope.testbrowser.testing import Browser
+ >>> from zope.app.wsgi.testlayer import Browser
>>> browser = Browser()
>>> browser.open("http://localhost/@@painting")
Traceback (most recent call last):
Modified: grokcore.view/trunk/src/grokcore/view/ftests/view/skindirective.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/ftests/view/skindirective.py 2010-05-25 16:03:15 UTC (rev 112705)
+++ grokcore.view/trunk/src/grokcore/view/ftests/view/skindirective.py 2010-05-25 16:13:29 UTC (rev 112706)
@@ -1,7 +1,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/++skin++casual/manfred/@@hello")
Modified: grokcore.view/trunk/src/grokcore/view/ftests/view/view.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/ftests/view/view.py 2010-05-25 16:03:15 UTC (rev 112705)
+++ grokcore.view/trunk/src/grokcore/view/ftests/view/view.py 2010-05-25 16:13:29 UTC (rev 112706)
@@ -1,7 +1,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/@@painting")
More information about the checkins
mailing list