Got exception tests working; error_catcher filter now paste-deploy-ified

4 files changed, 21 insertions, 5 deletions

diff --git a/tests/exceptions/__init__.py b/tests/test_exceptions/__init__.py
index 792d600..792d600 100644
--- a/tests/exceptions/__init__.py
+++ b/tests/test_exceptions/__init__.py
diff --git a/tests/exceptions/test_error_middleware.py b/tests/test_exceptions/test_error_middleware.py
index 956aa26..c7f6370 100644
--- a/tests/exceptions/test_error_middleware.py
+++ b/tests/test_exceptions/test_error_middleware.py
@@ -1,14 +1,30 @@
-from fixture import *
-from paste.errormiddleware import ErrorMiddleware
+from paste.fixture import *
+from paste.exceptions.errormiddleware import ErrorMiddleware
 from paste import lint
 
 def do_request(app, expect_status=500):
     app = lint.middleware(app)
     app = ErrorMiddleware(app, {}, debug=True)
+    app = clear_middleware(app)
     testapp = TestApp(app)
-    res = TestApp.get('', status=expect_status)
+    res = testapp.get('', status=expect_status,
+                      expect_errors=True)
     return res
 
+def clear_middleware(app):
+    """
+    The fixture sets paste.throw_errors, which suppresses exactly what
+    we want to test in this case.
+    """
+    def clear_throw_errors(environ, start_response):
+        def replacement(status, headers, exc_info=None):
+            return start_response(status, headers)
+        if 'paste.throw_errors' in environ:
+            del environ['paste.throw_errors']
+        return app(environ, replacement)
+    return clear_throw_errors
+    
+
 ############################################################
 ## Applications that raise exceptions
 ############################################################
@@ -53,13 +69,13 @@ def test_start_res():
     print res
     assert 'ValueError: hi' in res
     assert 'test_error_middleware.py' in res
-    assert 'line 17 in <tt>start_response_app</tt>' in res
+    assert 'line 38 in <tt>start_response_app</tt>' in res
 
 def test_after_start():
     res = do_request(after_start_response_app, 200)
     print res
     assert 'ValueError: error2' in res
-    assert 'line 21' in res
+    assert 'line 42' in res
 
 def test_iter_app():
     res = do_request(iter_app, 200)
diff --git a/tests/exceptions/test_formatter.py b/tests/test_exceptions/test_formatter.py
index 53b0d10..53b0d10 100644
--- a/tests/exceptions/test_formatter.py
+++ b/tests/test_exceptions/test_formatter.py
diff --git a/tests/exceptions/test_reporter.py b/tests/test_exceptions/test_reporter.py
index da6c470..da6c470 100644
--- a/tests/exceptions/test_reporter.py
+++ b/tests/test_exceptions/test_reporter.py