From 883527aa487b1374d1ccbffe571c16c55967f8a0 Mon Sep 17 00:00:00 2001
From: Marius Gedminas <marius@gedmin.as>
Date: Tue, 19 Mar 2013 14:15:43 +0200
Subject: [PATCH] Make tests pass with zope.app.wsgi 4.0.0a3

Require zope.app.wsgi >= 4.0dev (for allowTearDown=True) for tests.
---
 CHANGES.txt                   | 2 +-
 buildout.cfg                  | 6 ++++++
 setup.py                      | 4 ++--
 src/z3c/etestbrowser/tests.py | 7 ++++++-
 src/z3c/etestbrowser/wsgi.py  | 4 ++--
 src/z3c/etestbrowser/wsgi.txt | 2 +-
 tox.ini                       | 2 +-
 7 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 10a455a..e04b956 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,7 +2,7 @@
 CHANGES
 =======
 
-2.0.1 (unreleased)
+3.0.0 (unreleased)
 ==================
 
 - Nothing changed yet.
diff --git a/buildout.cfg b/buildout.cfg
index 14062d0..1aebebe 100644
--- a/buildout.cfg
+++ b/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
diff --git a/setup.py b/setup.py
index ef82183..266ed52 100644
--- a/setup.py
+++ b/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'},
diff --git a/src/z3c/etestbrowser/tests.py b/src/z3c/etestbrowser/tests.py
index e2e2425..1b4e544 100644
--- a/src/z3c/etestbrowser/tests.py
+++ b/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)
diff --git a/src/z3c/etestbrowser/wsgi.py b/src/z3c/etestbrowser/wsgi.py
index ae80c90..c9b30dd 100644
--- a/src/z3c/etestbrowser/wsgi.py
+++ b/src/z3c/etestbrowser/wsgi.py
@@ -18,7 +18,7 @@
 
 
 class Browser(zope.testbrowser.wsgi.Browser,
-                          z3c.etestbrowser.browser.ExtendedTestBrowser):
+              z3c.etestbrowser.browser.ExtendedTestBrowser):
     """An extended testbrowser implementation.
 
     Based on zope.testbrowser.wsgi.Browser.
@@ -26,4 +26,4 @@ class Browser(zope.testbrowser.wsgi.Browser,
     """
 
 # Just for backwards compatibility with versions before 2.0:
-ExtendedTestBrowser = Browser
\ No newline at end of file
+ExtendedTestBrowser = Browser
diff --git a/src/z3c/etestbrowser/wsgi.txt b/src/z3c/etestbrowser/wsgi.txt
index 63e6a6b..c959005 100644
--- a/src/z3c/etestbrowser/wsgi.txt
+++ b/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 ...>
diff --git a/tox.ini b/tox.ini
index f69061a..1ce9d8a 100644
--- a/tox.ini
+++ b/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]