Make tests pass with zope.app.wsgi 4.0.0a3

Require zope.app.wsgi >= 4.0dev (for allowTearDown=True) for tests.

CHANGES.txt

@@ -2,7 +2,7 @@
 CHANGES
 =======
 
-2.0.1 (unreleased)
+3.0.0 (unreleased)
 ==================
 
 - Nothing changed yet.

buildout.cfg

@@ -5,3 +5,9 @@ parts = test
 [test]
 recipe = zc.recipe.testrunner
 eggs = z3c.etestbrowser [test]
+
+[versions]
+# we need zope.app.wsgi >= 4.0dev, which requires these non-final versions
+zope.traversing = >= 4.0dev
+zope.publisher = >= 4.0dev
+zope.i18n = >= 4.0dev

setup.py

@@ -32,7 +32,7 @@ def get_test_requires():
 test_requires = get_test_requires()
 
 setup(name='z3c.etestbrowser',
-      version='2.0.1dev',
+      version='3.0.0dev',
       author='Christian Theune',
       author_email='ct@gocept.com',
       description='Extensions for zope.testbrowser',
@@ -61,7 +61,7 @@ def get_test_requires():
           'Topic :: Internet :: WWW/HTTP',
           'Framework :: Zope3',
       ],
-      url='http://pypi.python.org/pypi/z3c.etestbrowser',
+      url='https://github.com/zopefoundation/z3c.etestbrowser',
       license='ZPL 2.1',
       packages=find_packages('src'),
       package_dir={'': 'src'},

src/z3c/etestbrowser/tests.py

@@ -28,7 +28,11 @@
     os.path.join(os.path.split(__file__)[0], 'ftesting.zcml'),
     __name__, 'ETestBrowserLayer', allow_teardown=True)
 
-wsgi_layer = zope.app.wsgi.testlayer.BrowserLayer(z3c.etestbrowser)
+wsgi_layer = zope.app.wsgi.testlayer.BrowserLayer(z3c.etestbrowser, allowTearDown=True)
+
+def setUpWSGI(test):
+    test.globs['wsgi_app'] = wsgi_layer.make_wsgi_app()
+
 
 def test_suite():
     suite = unittest.TestSuite()
@@ -43,6 +47,7 @@ def test_suite():
 
     wsgi_test = doctest.DocFileSuite(
         "wsgi.txt",
+        setUp=setUpWSGI,
         optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS)
     wsgi_test.layer = wsgi_layer
     suite.addTest(wsgi_test)

src/z3c/etestbrowser/wsgi.py

@@ -18,12 +18,12 @@
 
 
 class Browser(zope.testbrowser.wsgi.Browser,
-                          z3c.etestbrowser.browser.ExtendedTestBrowser):
+              z3c.etestbrowser.browser.ExtendedTestBrowser):
     """An extended testbrowser implementation.
 
     Based on zope.testbrowser.wsgi.Browser.
 
     """
 
 # Just for backwards compatibility with versions before 2.0:
-ExtendedTestBrowser = Browser
+ExtendedTestBrowser = Browser

src/z3c/etestbrowser/wsgi.txt

@@ -7,7 +7,7 @@ the WSGI variant of ``zope.testbrowser``.
 Example:
 
   >>> import z3c.etestbrowser.wsgi
-  >>> browser = z3c.etestbrowser.wsgi.Browser()
+  >>> browser = z3c.etestbrowser.wsgi.Browser(wsgi_app=wsgi_app)
   >>> browser.open("http://localhost/")
   >>> print browser.contents
   <!DOCTYPE ...>

tox.ini

@@ -5,7 +5,7 @@ envlist =
 [testenv]
 deps =
     zope.app.testing
-    zope.app.wsgi>=3.8
+    zope.app.wsgi >= 4.0dev
     zope.app.zcmlfiles
     zope.app.server
     zope.testbrowser[test]