Ticket #3162: test_client_exception_catch.patch

django/test/client.py

@@ -1 +1 @@
 from cStringIO import StringIO
+import sys
 from django.core.handlers.base import BaseHandler
 from django.core.handlers.wsgi import WSGIRequest
+from django.core.signals import got_request_exception
 from django.dispatch import dispatcher
 from django.http import urlencode, SimpleCookie
 from django.test import signals
@@ -98 +100 @@
         self.handler = ClientHandler()
         self.defaults = defaults
         self.cookie = SimpleCookie()
+        self.exc_info = None
 
     def request(self, **request):
         """
@@ -106 +109 @@
         Assumes defaults for the query environment, which can be overridden
         using the arguments to the request.
         """
+        self.exc_info = None
 
         environ = {
             'HTTP_COOKIE':      self.cookie,
@@ -126 +130 @@
         on_template_render = curry(store_rendered_templates, data)
         dispatcher.connect(on_template_render, signal=signals.template_rendered)
 
+        # Capture exceptions created by the handler
+        dispatcher.connect(self.store_exc_info, signal=got_request_exception)
+
         response = self.handler(environ)
 
         # Add any rendered template detail to the response
@@ -143 +150 @@
         if response.cookies:
             self.cookie.update(response.cookies)
 
+        # Look for a signalled exception and reraise it
+        if self.exc_info:
+            raise self.exc_info[1], None, self.exc_info[2]
+
         return response
 
     def get(self, path, data={}, **extra):
@@ -214 +242 @@
 
         # Since we are logged in, request the actual page again
         return self.get(path)
+
+    def store_exc_info(self, *args, **kwargs):
+        self.exc_info = sys.exc_info()