mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-23 21:59:11 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #14523 -- Modified response handling so that exceptions raised by process_response() in a middleware are caught and handled like any other exception. Thanks to Ivan Sagalaev for the report and patch.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14393 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee
2010-10-29 07:43:56 +00:00
parent c38a174f7c
commit 3086b55b0e
4 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tests/regressiontests/middleware_exceptions/tests.py
View File

@@ -6,10 +6,14 @@ from django.core.signals import got_request_exception
class TestException(Exception):
pass
class TestMiddleware(object):
class TestRequestMiddleware(object):
def process_request(self, request):
raise TestException('Test Exception')
class TestResponseMiddleware(object):
def process_response(self, request, response):
raise TestException('Test Exception')
class MiddlewareExceptionTest(TestCase):
def setUp(self):
self.exceptions = []
@@ -23,12 +27,11 @@ class MiddlewareExceptionTest(TestCase):
def _on_request_exception(self, sender, request, **kwargs):
self.exceptions.append(sys.exc_info())
def test_process_request(self):
self.client.handler._request_middleware.insert(0, TestMiddleware().process_request)
def _assert_exception_handled(self):
try:
response = self.client.get('/')
response = self.client.get('/middleware_exceptions/')
except TestException, e:
# Test client indefinitely re-raises any exceptions being raised
# Test client intentionally re-raises any exceptions being raised
# during request handling. Hence actual testing that exception was
# properly handled is done by relying on got_request_exception
# signal being sent.
@@ -38,3 +41,11 @@ class MiddlewareExceptionTest(TestCase):
self.assertEquals(len(self.exceptions), 1)
exception, value, tb = self.exceptions[0]
self.assertEquals(value.args, ('Test Exception', ))
def test_process_request(self):
self.client.handler._request_middleware.insert(0, TestRequestMiddleware().process_request)
self._assert_exception_handled()
def test_process_response(self):
self.client.handler._response_middleware.insert(0, TestResponseMiddleware().process_response)
self._assert_exception_handled()