Ticket #16507: 16507.3.diff

django/contrib/messages/tests/base.py

@@ -56 +56 @@
 
     def setUp(self):
         self.settings_override = override_settings_tags(
+            DEBUG_PROPAGATE_EXCEPTIONS = True,
             TEMPLATE_DIRS   = (),
             MESSAGE_TAGS    = '',
             MESSAGE_STORAGE = '%s.%s' % (self.storage_class.__module__,

django/contrib/messages/tests/cookie.py

@@ -3 +3 @@
 from django.contrib.messages.storage.cookie import (CookieStorage,
     MessageEncoder, MessageDecoder)
 from django.contrib.messages.storage.base import Message
+from django.test.utils import override_settings
 from django.utils import simplejson as json
-from django.conf import settings
 
 
 def set_cookie_data(storage, messages, invalid=False, encode_empty=False):
@@ -41 +41 @@
 class CookieTest(BaseTest):
     storage_class = CookieStorage
 
-    def setUp(self):
-        super(CookieTest, self).setUp()
-        self.old_SESSION_COOKIE_DOMAIN = settings.SESSION_COOKIE_DOMAIN
-        settings.SESSION_COOKIE_DOMAIN = '.lawrence.com'
-
-    def tearDown(self):
-        super(CookieTest, self).tearDown()
-        settings.SESSION_COOKIE_DOMAIN = self.old_SESSION_COOKIE_DOMAIN
-
     def stored_messages_count(self, storage, response):
         return stored_cookie_messages_count(storage, response)
 
@@ -139 +130 @@
         value = encoder.encode(messages)
         decoded_messages = json.loads(value, cls=MessageDecoder)
         self.assertEqual(messages, decoded_messages)
+
+CookieTest = override_settings(
+        SESSION_COOKIE_DOMAIN='.lawrence.com')(CookieTest)