Ticket #16507: 16507.5.diff

django/contrib/messages/tests/base.py

@@ -56 +56 @@
 
     def setUp(self):
         self.settings_override = override_settings_tags(
-            TEMPLATE_DIRS   = (),
+            TEMPLATE_LOADERS = (),
             MESSAGE_TAGS    = '',
             MESSAGE_STORAGE = '%s.%s' % (self.storage_class.__module__,
                                          self.storage_class.__name__),
         )
         self.settings_override.enable()
+        self.reset_handlers_state()
 
     def tearDown(self):
         self.settings_override.disable()
+        self.restore_handlers_state()
 
     def get_request(self):
         return http.HttpRequest()

django/test/testcases.py

@@ -6 +6 @@
 from urlparse import urlsplit, urlunsplit
 from xml.dom.minidom import parseString, Node
 
-from django.conf import settings
+from django.conf import settings, urls as urlhandlers
 from django.core import mail
 from django.core.exceptions import ValidationError
 from django.core.management import call_command
@@ -262 +262 @@
         """
         restore_warnings_state(self._warnings_state)
 
+    def reset_handlers_state(self):
+        """
+        Save url handlers state and reset to default value
+        """
+        self._old_url_handlers = (
+            urlhandlers.handler403,
+            urlhandlers.handler404,
+            urlhandlers.handler500
+        )
+        handler403 = 'django.views.defaults.permission_denied'
+        handler404 = 'django.views.defaults.page_not_found'
+        handler500 = 'django.views.defaults.server_error'
+
+    def restore_handlers_state(self):
+        """
+        Restore handlers to the state before reset_handlers_state()
+        """
+        handler403, handler404, handler500 = self._old_url_handlers
+
     def settings(self, **kwargs):
         """
         A context manager that temporarily sets a setting and reverts