Author: julien
Date: 2011-10-24 19:55:25 -0700 (Mon, 24 Oct 2011)
New Revision: 17032
Modified:
django/trunk/django/contrib/messages/tests/cookie.py
Log:
Made some `contrib.messages` tests use `override_settings` for clarity. Thanks
to Claude Paroz for the patch. Refs #16507, #16574.
Modified: django/trunk/django/contrib/messages/tests/cookie.py
===================================================================
--- django/trunk/django/contrib/messages/tests/cookie.py 2011-10-24
21:30:55 UTC (rev 17031)
+++ django/trunk/django/contrib/messages/tests/cookie.py 2011-10-25
02:55:25 UTC (rev 17032)
@@ -3,8 +3,8 @@
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,15 +41,6 @@
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,3 +130,6 @@
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)
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com.
To unsubscribe from this group, send email to
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
