test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Made some `contrib.messages` tests use `override_settings` for clarity. Thanks to Claude Paroz for the patch. Refs #16507, #16574. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17032 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Julien Phalip 2011-10-25 02:55:25 +00:00
parent 6df91d9539
commit c1a014bba4
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
django/contrib/messages/tests/cookie.py
View File

@ -3,8 +3,8 @@ from django.contrib.messages.tests.base import BaseTest
from django.contrib.messages.storage.cookie import (CookieStorage, from django.contrib.messages.storage.cookie import (CookieStorage,
MessageEncoder, MessageDecoder) MessageEncoder, MessageDecoder)
from django.contrib.messages.storage.base import Message from django.contrib.messages.storage.base import Message
from django.test.utils import override_settings
from django.utils import simplejson as json from django.utils import simplejson as json
from django.conf import settings
def set_cookie_data(storage, messages, invalid=False, encode_empty=False): def set_cookie_data(storage, messages, invalid=False, encode_empty=False):
@ -41,15 +41,6 @@ def stored_cookie_messages_count(storage, response):
class CookieTest(BaseTest): class CookieTest(BaseTest):
storage_class = CookieStorage 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): def stored_messages_count(self, storage, response):
return stored_cookie_messages_count(storage, response) return stored_cookie_messages_count(storage, response)
@ -139,3 +130,6 @@ class CookieTest(BaseTest):
value = encoder.encode(messages) value = encoder.encode(messages)
decoded_messages = json.loads(value, cls=MessageDecoder) decoded_messages = json.loads(value, cls=MessageDecoder)
self.assertEqual(messages, decoded_messages) self.assertEqual(messages, decoded_messages)
CookieTest = override_settings(
SESSION_COOKIE_DOMAIN='.lawrence.com')(CookieTest)