Author: jezdez
Date: 2010-11-13 12:43:13 -0600 (Sat, 13 Nov 2010)
New Revision: 14557
Modified:
django/trunk/django/contrib/messages/tests/base.py
django/trunk/django/contrib/messages/tests/user_messages.py
Log:
Fixed #14632 -- Skip a messages test if auth app is not in INSTALLED_APPS.
Thanks, gregmuellegger.
Modified: django/trunk/django/contrib/messages/tests/base.py
===================================================================
--- django/trunk/django/contrib/messages/tests/base.py 2010-11-13 18:42:56 UTC
(rev 14556)
+++ django/trunk/django/contrib/messages/tests/base.py 2010-11-13 18:43:13 UTC
(rev 14557)
@@ -4,6 +4,7 @@
from django.test import TestCase
from django.conf import settings
from django.utils.translation import ugettext_lazy
+from django.utils.unittest import skipIf
from django.contrib.messages import constants, utils, get_level, set_level
from django.contrib.messages.api import MessageFailure
from django.contrib.messages.storage import default_storage, base
@@ -12,6 +13,12 @@
from django.contrib.auth.models import User
+def skipUnlessAuthIsInstalled(func):
+ return skipIf(
+ 'django.contrib.auth' not in settings.INSTALLED_APPS,
+ "django.contrib.auth isn't installed")(func)
+
+
def add_level_messages(storage):
"""
Adds 6 messages from different levels (including a custom one) to a storage
@@ -196,6 +203,7 @@
for msg in data['messages']:
self.assertContains(response, msg)
+ @skipUnlessAuthIsInstalled
def test_middleware_disabled_auth_user(self):
"""
Tests that the messages API successfully falls back to using
Modified: django/trunk/django/contrib/messages/tests/user_messages.py
===================================================================
--- django/trunk/django/contrib/messages/tests/user_messages.py 2010-11-13
18:42:56 UTC (rev 14556)
+++ django/trunk/django/contrib/messages/tests/user_messages.py 2010-11-13
18:43:13 UTC (rev 14557)
@@ -2,6 +2,7 @@
from django.contrib.auth.models import User
from django.contrib.messages.storage.user_messages import UserMessagesStorage,\
LegacyFallbackStorage
+from django.contrib.messages.tests.base import skipUnlessAuthIsInstalled
from django.contrib.messages.tests.cookie import set_cookie_data
from django.contrib.messages.tests.fallback import FallbackTest
from django.test import TestCase
@@ -30,7 +31,9 @@
self.assertEqual(len(storage), 1)
self.assertEqual(list(storage)[0].message, 'test message')
+UserMessagesTest = skipUnlessAuthIsInstalled(UserMessagesTest)
+
class LegacyFallbackTest(FallbackTest, TestCase):
storage_class = LegacyFallbackStorage
@@ -63,3 +66,5 @@
self.assertEqual(len(storage), 2)
self.assertEqual(list(storage)[0].message, 'user message')
self.assertEqual(list(storage)[1], 'cookie')
+
+LegacyFallbackTest = skipUnlessAuthIsInstalled(LegacyFallbackTest)
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-upda...@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.
