Log message for revision 117425:
- Got rid of `zope.app.testing` test dependency by using `zope.app.wsgi`.
Changed:
U z3c.layer.pagelet/trunk/CHANGES.txt
U z3c.layer.pagelet/trunk/setup.py
U z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/README.txt
U z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/tests/bugfixes.txt
U z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/tests/test_layer.py
-=-
Modified: z3c.layer.pagelet/trunk/CHANGES.txt
===================================================================
--- z3c.layer.pagelet/trunk/CHANGES.txt 2010-10-11 09:05:44 UTC (rev 117424)
+++ z3c.layer.pagelet/trunk/CHANGES.txt 2010-10-11 09:15:42 UTC (rev 117425)
@@ -8,7 +8,9 @@
- Fixed tests: Using manager account, so anonymous user does not need to get
all permissions for running tests successfully.
+- Got rid of `zope.app.testing` test dependency by using `zope.app.wsgi`.
+
1.8.0 (2010-08-20)
------------------
Modified: z3c.layer.pagelet/trunk/setup.py
===================================================================
--- z3c.layer.pagelet/trunk/setup.py 2010-10-11 09:05:44 UTC (rev 117424)
+++ z3c.layer.pagelet/trunk/setup.py 2010-10-11 09:15:42 UTC (rev 117425)
@@ -56,7 +56,7 @@
test = [
'zope.testbrowser',
'zope.app.authentication',
- 'zope.app.testing',
+ 'zope.app.wsgi >= 3.8',
'zope.exceptions',
'zope.principalregistry',
'zope.publisher',
Modified: z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/README.txt
===================================================================
--- z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/README.txt 2010-10-11 09:05:44 UTC (rev 117424)
+++ z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/README.txt 2010-10-11 09:15:42 UTC (rev 117425)
@@ -49,7 +49,7 @@
Login as manager first:
- >>> from zope.testbrowser.testing import Browser
+ >>> from zope.app.wsgi.testlayer import Browser
>>> manager = Browser()
Check if we can access the ``page.html`` view which is registred in the
Modified: z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/tests/bugfixes.txt
===================================================================
--- z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/tests/bugfixes.txt 2010-10-11 09:05:44 UTC (rev 117424)
+++ z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/tests/bugfixes.txt 2010-10-11 09:15:42 UTC (rev 117425)
@@ -13,7 +13,7 @@
>>> import zope.site.folder
>>> getRootFolder()['test'] = zope.site.folder.Folder()
- >>> from zope.testbrowser.testing import Browser
+ >>> from zope.app.wsgi.testlayer import Browser
>>> manager = Browser()
>>> manager.addHeader('Authorization', 'Basic mgr:mgrpw')
>>> skinURL = 'http://localhost/++skin++PageletTestSkin'
Modified: z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/tests/test_layer.py
===================================================================
--- z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/tests/test_layer.py 2010-10-11 09:05:44 UTC (rev 117424)
+++ z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/tests/test_layer.py 2010-10-11 09:15:42 UTC (rev 117425)
@@ -15,22 +15,26 @@
$Id: __init__.py 97 2007-03-29 22:58:27Z rineichen $
"""
+import doctest
import re
import unittest
-from zope.testing import renormalizing
-from zope.app.testing import functional
+import z3c.layer.pagelet.tests
+import zope.app.wsgi.testlayer
+import zope.testing.renormalizing
-functional.defineLayer('TestLayer', 'ftesting.zcml')
+TestLayer = zope.app.wsgi.testlayer.BrowserLayer(z3c.layer.pagelet.tests)
-checker = renormalizing.RENormalizing([
+checker = zope.testing.renormalizing.RENormalizing([
(re.compile(r'httperror_seek_wrapper:', re.M), 'HTTPError:'),
])
def create_suite(*args, **kw):
- suite = functional.FunctionalDocFileSuite(*args, **kw)
+ kw['optionflags'] = doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS
+ kw['globs'] = dict(getRootFolder=TestLayer.getRootFolder)
+ suite = doctest.DocFileSuite(*args, **kw)
suite.layer = TestLayer
return suite