[Checkins] SVN: grok/branches/sylvain-testlayers/s Remove zope.app.testing dependency and use zope.app.wsgi testing capabitlities instead.
Sylvain Viollon
sylvain at infrae.com
Wed Apr 14 11:39:17 EDT 2010
Log message for revision 110901:
Remove zope.app.testing dependency and use zope.app.wsgi testing capabitlities instead.
Changed:
U grok/branches/sylvain-testlayers/setup.py
U grok/branches/sylvain-testlayers/src/grok/ftests/catalog/addform.py
U grok/branches/sylvain-testlayers/src/grok/ftests/form/form.py
U grok/branches/sylvain-testlayers/src/grok/ftests/security/grok_view.py
U grok/branches/sylvain-testlayers/src/grok/ftests/security/handle_exception.py
U grok/branches/sylvain-testlayers/src/grok/ftests/security/json.py
U grok/branches/sylvain-testlayers/src/grok/ftests/security/preserve_permissions.py
U grok/branches/sylvain-testlayers/src/grok/ftests/security/roles.py
U grok/branches/sylvain-testlayers/src/grok/ftests/security/security_view.py
U grok/branches/sylvain-testlayers/src/grok/ftests/test_grok_functional.py
U grok/branches/sylvain-testlayers/src/grok/ftests/traversal/containertraverse.py
U grok/branches/sylvain-testlayers/src/grok/ftests/traversal/containertraverser.py
U grok/branches/sylvain-testlayers/src/grok/ftests/traversal/items_before_views.py
U grok/branches/sylvain-testlayers/src/grok/ftests/traversal/modeltraverse.py
U grok/branches/sylvain-testlayers/src/grok/ftests/traversal/traversableattr.py
U grok/branches/sylvain-testlayers/src/grok/ftests/traversal/traverser.py
U grok/branches/sylvain-testlayers/src/grok/ftests/traversal/traverser_sets_parent.py
U grok/branches/sylvain-testlayers/src/grok/ftests/url/application.py
U grok/branches/sylvain-testlayers/src/grok/ftests/viewlet/viewlet_security.py
-=-
Modified: grok/branches/sylvain-testlayers/setup.py
===================================================================
--- grok/branches/sylvain-testlayers/setup.py 2010-04-14 15:37:50 UTC (rev 110900)
+++ grok/branches/sylvain-testlayers/setup.py 2010-04-14 15:39:16 UTC (rev 110901)
@@ -14,9 +14,8 @@
)
tests_require = [
- 'zope.app.testing',
+ 'zope.app.wsgi',
'zope.configuration',
- 'zope.testbrowser',
'zope.testing',
]
@@ -91,7 +90,6 @@
'zope.app.appsetup',
'zope.app.pagetemplate',
'zope.app.security',
- 'zope.app.twisted',
'zope.deprecation',
'zope.dottedname',
'zope.hookable',
Modified: grok/branches/sylvain-testlayers/src/grok/ftests/catalog/addform.py
===================================================================
--- grok/branches/sylvain-testlayers/src/grok/ftests/catalog/addform.py 2010-04-14 15:37:50 UTC (rev 110900)
+++ grok/branches/sylvain-testlayers/src/grok/ftests/catalog/addform.py 2010-04-14 15:39:16 UTC (rev 110901)
@@ -4,7 +4,7 @@
>>> getRootFolder()["zoo"] = Zoo()
- >>> from zope.testbrowser.testing import Browser
+ >>> from zope.app.wsgi.testlayer import Browser
>>> browser = Browser()
>>> browser.handleErrors = False
Modified: grok/branches/sylvain-testlayers/src/grok/ftests/form/form.py
===================================================================
--- grok/branches/sylvain-testlayers/src/grok/ftests/form/form.py 2010-04-14 15:37:50 UTC (rev 110900)
+++ grok/branches/sylvain-testlayers/src/grok/ftests/form/form.py 2010-04-14 15:39:16 UTC (rev 110901)
@@ -8,7 +8,7 @@
And we can access the display form which display the application URL::
- >>> from zope.testbrowser.testing import Browser
+ >>> from zope.app.wsgi.testlayer import Browser
>>> browser = Browser()
>>> browser.handleErrors = False
>>> browser.open('http://localhost/world/arthur')
Modified: grok/branches/sylvain-testlayers/src/grok/ftests/security/grok_view.py
===================================================================
--- grok/branches/sylvain-testlayers/src/grok/ftests/security/grok_view.py 2010-04-14 15:37:50 UTC (rev 110900)
+++ grok/branches/sylvain-testlayers/src/grok/ftests/security/grok_view.py 2010-04-14 15:39:16 UTC (rev 110901)
@@ -9,7 +9,7 @@
Now we can look at the view::
- >>> from zope.testbrowser.testing import Browser
+ >>> from zope.app.wsgi.testlayer import Browser
>>> browser = Browser()
>>> browser.handleErrors = False
>>> browser.open('http://localhost/app/@@index')
Modified: grok/branches/sylvain-testlayers/src/grok/ftests/security/handle_exception.py
===================================================================
--- grok/branches/sylvain-testlayers/src/grok/ftests/security/handle_exception.py 2010-04-14 15:37:50 UTC (rev 110900)
+++ grok/branches/sylvain-testlayers/src/grok/ftests/security/handle_exception.py 2010-04-14 15:39:16 UTC (rev 110901)
@@ -4,7 +4,7 @@
and cause the grok security to fail, we have a simple test here that assures
that we don't hit this:
- >>> from zope.testbrowser.testing import Browser
+ >>> from zope.app.wsgi.testlayer import Browser
>>> browser = Browser()
>>> browser.open("http://localhost/@@cave")
Traceback (most recent call last):
Modified: grok/branches/sylvain-testlayers/src/grok/ftests/security/json.py
===================================================================
--- grok/branches/sylvain-testlayers/src/grok/ftests/security/json.py 2010-04-14 15:37:50 UTC (rev 110900)
+++ grok/branches/sylvain-testlayers/src/grok/ftests/security/json.py 2010-04-14 15:39:16 UTC (rev 110901)
@@ -1,7 +1,7 @@
"""
Let's test whether require decorators work for json methods.
- >>> from zope.testbrowser.testing import Browser
+ >>> from zope.app.wsgi.testlayer import Browser
>>> browser = Browser()
We can access the public method just fine::
Modified: grok/branches/sylvain-testlayers/src/grok/ftests/security/preserve_permissions.py
===================================================================
--- grok/branches/sylvain-testlayers/src/grok/ftests/security/preserve_permissions.py 2010-04-14 15:37:50 UTC (rev 110900)
+++ grok/branches/sylvain-testlayers/src/grok/ftests/security/preserve_permissions.py 2010-04-14 15:39:16 UTC (rev 110901)
@@ -62,7 +62,7 @@
The default view is accessible::
- >>> from zope.testbrowser.testing import Browser
+ >>> from zope.app.wsgi.testlayer import Browser
>>> browser = Browser()
>>> browser.open('http://localhost/app')
>>> print browser.contents
Modified: grok/branches/sylvain-testlayers/src/grok/ftests/security/roles.py
===================================================================
--- grok/branches/sylvain-testlayers/src/grok/ftests/security/roles.py 2010-04-14 15:37:50 UTC (rev 110900)
+++ grok/branches/sylvain-testlayers/src/grok/ftests/security/roles.py 2010-04-14 15:39:16 UTC (rev 110901)
@@ -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/@@cavepainting")
Modified: grok/branches/sylvain-testlayers/src/grok/ftests/security/security_view.py
===================================================================
--- grok/branches/sylvain-testlayers/src/grok/ftests/security/security_view.py 2010-04-14 15:37:50 UTC (rev 110900)
+++ grok/branches/sylvain-testlayers/src/grok/ftests/security/security_view.py 2010-04-14 15:39:16 UTC (rev 110901)
@@ -25,7 +25,7 @@
However, when we want to watch this view, we run into trouble::
- >>> from zope.testbrowser.testing import Browser
+ >>> from zope.app.wsgi.testlayer import Browser
>>> browser = Browser()
>>> browser.handleErrors = False
>>> browser.open('http://localhost/app/@@index')
Modified: grok/branches/sylvain-testlayers/src/grok/ftests/test_grok_functional.py
===================================================================
--- grok/branches/sylvain-testlayers/src/grok/ftests/test_grok_functional.py 2010-04-14 15:37:50 UTC (rev 110900)
+++ grok/branches/sylvain-testlayers/src/grok/ftests/test_grok_functional.py 2010-04-14 15:39:16 UTC (rev 110901)
@@ -1,23 +1,13 @@
import re
import unittest
import grok
-import os.path
from pkg_resources import resource_listdir
from zope.testing import doctest, renormalizing
-from zope.app.testing.functional import (HTTPCaller, getRootFolder,
- FunctionalTestSetup, sync, ZCMLLayer)
+from zope.app.wsgi.testlayer import BrowserLayer, http
-ftesting_zcml = os.path.join(os.path.dirname(grok.__file__), 'ftesting.zcml')
-GrokFunctionalLayer = ZCMLLayer(ftesting_zcml, __name__, 'GrokFunctionalLayer',
- allow_teardown=True)
+FunctionalLayer = BrowserLayer(grok)
-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:'),
@@ -40,7 +30,7 @@
if data is not None:
request_string += '\r\n'
request_string += data
- return HTTPCaller()(request_string, handle_errors=False)
+ return http(request_string, handle_errors=False)
def suiteFromPackage(name):
files = resource_listdir(__name__, name)
@@ -53,17 +43,15 @@
dottedname = 'grok.ftests.%s.%s' % (name, filename[:-3])
test = doctest.DocTestSuite(
- dottedname, setUp=setUp, tearDown=tearDown,
+ dottedname,
checker=checker,
- extraglobs=dict(http=HTTPCaller(),
- http_call=http_call,
- getRootFolder=getRootFolder,
- sync=sync),
+ extraglobs=dict(http_call=http_call,
+ http=http,
+ getRootFolder=FunctionalLayer.getRootFolder),
optionflags=(doctest.ELLIPSIS+
doctest.NORMALIZE_WHITESPACE+
- doctest.REPORT_NDIFF)
- )
- test.layer = GrokFunctionalLayer
+ doctest.REPORT_NDIFF))
+ test.layer = FunctionalLayer
suite.addTest(test)
return suite
Modified: grok/branches/sylvain-testlayers/src/grok/ftests/traversal/containertraverse.py
===================================================================
--- grok/branches/sylvain-testlayers/src/grok/ftests/traversal/containertraverse.py 2010-04-14 15:37:50 UTC (rev 110900)
+++ grok/branches/sylvain-testlayers/src/grok/ftests/traversal/containertraverse.py 2010-04-14 15:39:16 UTC (rev 110901)
@@ -9,7 +9,7 @@
Let's first try to look up the special traversed item:
- >>> from zope.testbrowser.testing import Browser
+ >>> from zope.app.wsgi.testlayer import Browser
>>> browser = Browser()
>>> browser.handleErrors = False
>>> browser.open("http://localhost/herd/special")
Modified: grok/branches/sylvain-testlayers/src/grok/ftests/traversal/containertraverser.py
===================================================================
--- grok/branches/sylvain-testlayers/src/grok/ftests/traversal/containertraverser.py 2010-04-14 15:37:50 UTC (rev 110900)
+++ grok/branches/sylvain-testlayers/src/grok/ftests/traversal/containertraverser.py 2010-04-14 15:39:16 UTC (rev 110901)
@@ -9,7 +9,7 @@
Let's first try to look up the special traversed item:
- >>> from zope.testbrowser.testing import Browser
+ >>> from zope.app.wsgi.testlayer import Browser
>>> browser = Browser()
>>> browser.handleErrors = False
>>> browser.open("http://localhost/herd/special")
Modified: grok/branches/sylvain-testlayers/src/grok/ftests/traversal/items_before_views.py
===================================================================
--- grok/branches/sylvain-testlayers/src/grok/ftests/traversal/items_before_views.py 2010-04-14 15:37:50 UTC (rev 110900)
+++ grok/branches/sylvain-testlayers/src/grok/ftests/traversal/items_before_views.py 2010-04-14 15:39:16 UTC (rev 110901)
@@ -8,7 +8,7 @@
>>> herd['manfred'] = Mammoth('Manfred')
>>> herd['ellie'] = Mammoth('Ellie')
- >>> from zope.testbrowser.testing import Browser
+ >>> from zope.app.wsgi.testlayer import Browser
>>> browser = Browser()
>>> browser.handleErrors = False
Modified: grok/branches/sylvain-testlayers/src/grok/ftests/traversal/modeltraverse.py
===================================================================
--- grok/branches/sylvain-testlayers/src/grok/ftests/traversal/modeltraverse.py 2010-04-14 15:37:50 UTC (rev 110900)
+++ grok/branches/sylvain-testlayers/src/grok/ftests/traversal/modeltraverse.py 2010-04-14 15:39:16 UTC (rev 110901)
@@ -4,7 +4,7 @@
>>> getRootFolder()["herd"] = Herd('The Big Mammoth Herd')
- >>> from zope.testbrowser.testing import Browser
+ >>> from zope.app.wsgi.testlayer import Browser
>>> browser = Browser()
>>> browser.handleErrors = False
>>> browser.open("http://localhost/herd/manfred")
Modified: grok/branches/sylvain-testlayers/src/grok/ftests/traversal/traversableattr.py
===================================================================
--- grok/branches/sylvain-testlayers/src/grok/ftests/traversal/traversableattr.py 2010-04-14 15:37:50 UTC (rev 110900)
+++ grok/branches/sylvain-testlayers/src/grok/ftests/traversal/traversableattr.py 2010-04-14 15:39:16 UTC (rev 110901)
@@ -3,7 +3,7 @@
>>> getRootFolder()["traversefoo"] = Foo('foo')
- >>> from zope.testbrowser.testing import Browser
+ >>> from zope.app.wsgi.testlayer import Browser
>>> browser = Browser()
>>> browser.handleErrors = False
Modified: grok/branches/sylvain-testlayers/src/grok/ftests/traversal/traverser.py
===================================================================
--- grok/branches/sylvain-testlayers/src/grok/ftests/traversal/traverser.py 2010-04-14 15:37:50 UTC (rev 110900)
+++ grok/branches/sylvain-testlayers/src/grok/ftests/traversal/traverser.py 2010-04-14 15:39:16 UTC (rev 110901)
@@ -4,7 +4,7 @@
>>> getRootFolder()["herd"] = Herd('The Big Mammoth Herd')
- >>> from zope.testbrowser.testing import Browser
+ >>> from zope.app.wsgi.testlayer import Browser
>>> browser = Browser()
>>> browser.handleErrors = False
>>> browser.open("http://localhost/herd/manfred")
Modified: grok/branches/sylvain-testlayers/src/grok/ftests/traversal/traverser_sets_parent.py
===================================================================
--- grok/branches/sylvain-testlayers/src/grok/ftests/traversal/traverser_sets_parent.py 2010-04-14 15:37:50 UTC (rev 110900)
+++ grok/branches/sylvain-testlayers/src/grok/ftests/traversal/traverser_sets_parent.py 2010-04-14 15:39:16 UTC (rev 110901)
@@ -4,7 +4,7 @@
>>> getRootFolder()["herd"] = Herd('The Big Mammoth Herd')
- >>> from zope.testbrowser.testing import Browser
+ >>> from zope.app.wsgi.testlayer import Browser
>>> browser = Browser()
>>> browser.handleErrors = False
>>> browser.open("http://localhost/herd/manfred")
Modified: grok/branches/sylvain-testlayers/src/grok/ftests/url/application.py
===================================================================
--- grok/branches/sylvain-testlayers/src/grok/ftests/url/application.py 2010-04-14 15:37:50 UTC (rev 110900)
+++ grok/branches/sylvain-testlayers/src/grok/ftests/url/application.py 2010-04-14 15:39:16 UTC (rev 110901)
@@ -7,7 +7,7 @@
Asking for the application_url on the cave returns the URL to the cave::
- >>> from zope.testbrowser.testing import Browser
+ >>> from zope.app.wsgi.testlayer import Browser
>>> browser = Browser()
>>> browser.handleErrors = False
>>> browser.open('http://localhost/cave')
Modified: grok/branches/sylvain-testlayers/src/grok/ftests/viewlet/viewlet_security.py
===================================================================
--- grok/branches/sylvain-testlayers/src/grok/ftests/viewlet/viewlet_security.py 2010-04-14 15:37:50 UTC (rev 110900)
+++ grok/branches/sylvain-testlayers/src/grok/ftests/viewlet/viewlet_security.py 2010-04-14 15:39:16 UTC (rev 110901)
@@ -17,7 +17,7 @@
Traverse to the view on the model object. We get the viewlets
registered for the default layer, with the anybody permission::
- >>> from zope.testbrowser.testing import Browser
+ >>> from zope.app.wsgi.testlayer import Browser
>>> browser = Browser()
>>> browser.handleErrors = False
>>> browser.open("http://localhost/wilma/@@caveview")
More information about the checkins
mailing list