Commit e054295f authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

Fixed #8136: Added a signal emission when an error is raised handling an... 

Fixed #8136: Added a signal emission when an error is raised handling an error. This was required for the test client to handle missing 404.html templates and errors in the 404.html template. Thanks to danfairs for the report and fix.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8464 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 462ee405

django/core/handlers/base.py

+4 −1
Original line number Diff line number Diff line
@@ -112,7 +112,10 @@ class BaseHandler(object): 
                    callback, param_dict = resolver.resolve404()

                    return callback(request, **param_dict)

                except:

                    try:

                        return self.handle_uncaught_exception(request, resolver, sys.exc_info())

                    finally:

                        receivers = signals.got_request_exception.send(sender=self.__class__, request=request)

        except exceptions.PermissionDenied:

            return http.HttpResponseForbidden('<h1>Permission denied</h1>')

        except SystemExit:

tests/regressiontests/test_client_regress/bad_templates/404.html

0 → 100644
+3 −0
Original line number Diff line number Diff line 
{% block foo %}



This template is deliberately bad - we want it to raise an exception when it is used.

tests/regressiontests/test_client_regress/models.py

+28 −0
Original line number Diff line number Diff line 
"""

Regression tests for the Test Client, especially the customized assertions.

"""

import os

from django.conf import settings



from django.test import Client, TestCase

from django.core.urlresolvers import reverse

from django.core.exceptions import SuspiciousOperation

from django.template import TemplateDoesNotExist, TemplateSyntaxError



class AssertContainsTests(TestCase):

    def test_contains(self):
@@ -307,6 +310,31 @@ class ExceptionTests(TestCase): 
        except SuspiciousOperation:

            self.fail("Staff should be able to visit this page")

    

class TemplateExceptionTests(TestCase):

    def setUp(self):

        self.old_templates = settings.TEMPLATE_DIRS

        settings.TEMPLATE_DIRS = ()

        

    def tearDown(self):

        settings.TEMPLATE_DIRS = self.old_templates

        

    def test_no_404_template(self):

        "Missing templates are correctly reported by test client"    

        try:

            response = self.client.get("/no_such_view/")

            self.fail("Should get error about missing template")

        except TemplateDoesNotExist:

            pass



    def test_bad_404_template(self):

        "Errors found when rendering 404 error templates are re-raised"

        settings.TEMPLATE_DIRS = (os.path.join(os.path.dirname(__file__), 'bad_templates'),)

        try:

            response = self.client.get("/no_such_view/")

            self.fail("Should get error about syntax error in template")

        except TemplateSyntaxError:

            pass

        

# We need two different tests to check URLconf substitution -  one to check

# it was changed, and another one (without self.urls) to check it was reverted on

# teardown. This pair of tests relies upon the alphabetical ordering of test execution.