Ticket #16507: 16507.diff

django/contrib/messages/tests/base.py

@@ -1 +1 @@
 from django import http
 from django.test import TestCase
+from django.test.utils import override_settings
 from django.conf import settings
 from django.utils.translation import ugettext_lazy
 from django.utils.unittest import skipIf
@@ -55 +56 @@
         self._message_storage = settings.MESSAGE_STORAGE
         settings.MESSAGE_STORAGE = '%s.%s' % (self.storage_class.__module__,
                                               self.storage_class.__name__)
-        self.old_TEMPLATE_DIRS = settings.TEMPLATE_DIRS
-        settings.TEMPLATE_DIRS = ()
 
     def tearDown(self):
         for setting in self.restore_settings:
@@ -67 +66 @@
            self._template_context_processors
         settings.INSTALLED_APPS = self._installed_apps
         settings.MESSAGE_STORAGE = self._message_storage
-        settings.TEMPLATE_DIRS = self.old_TEMPLATE_DIRS
 
     def restore_setting(self, setting):
         if setting in self._remembered_settings:
@@ -392 +390 @@
             # Ensure the level tags constant is put back like we found it.
             self.restore_setting('MESSAGE_TAGS')
             base.LEVEL_TAGS = utils.get_level_tags()
+
+
+BaseTest = override_settings(DEBUG_PROPAGATE_EXCEPTIONS=True,
+                             TEMPLATE_DIRS=())(BaseTest)