innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Remove a special case for comment tests from runtests.py.

This commit is contained in:
Jacob Kaplan-Moss 2013-03-11 10:04:58 -05:00
parent 571b2d139b
commit d056124269
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/comment_tests/tests/comment_utils_moderators_tests.py
View File

@ -4,6 +4,7 @@ from django.contrib.comments.models import Comment
from django.contrib.comments.moderation import (moderator, CommentModerator, from django.contrib.comments.moderation import (moderator, CommentModerator,
AlreadyModerated) AlreadyModerated)
from django.core import mail from django.core import mail
from django.test.utils import override_settings
from . import CommentTestCase from . import CommentTestCase
from ..models import Entry from ..models import Entry
@ -67,9 +68,10 @@ class CommentUtilsModeratorTests(CommentTestCase):
self.assertRaises(AlreadyModerated, moderator.register, Entry, EntryModerator1) self.assertRaises(AlreadyModerated, moderator.register, Entry, EntryModerator1)
def testEmailNotification(self): def testEmailNotification(self):
moderator.register(Entry, EntryModerator1) with override_settings(MANAGERS=("test@example.com",)):
self.createSomeComments() moderator.register(Entry, EntryModerator1)
self.assertEqual(len(mail.outbox), 2) self.createSomeComments()
self.assertEqual(len(mail.outbox), 2)
def testCommentsEnabled(self): def testCommentsEnabled(self):
moderator.register(Entry, EntryModerator2) moderator.register(Entry, EntryModerator2)
@ -94,4 +96,4 @@ class CommentUtilsModeratorTests(CommentTestCase):
def testAutoCloseFieldImmediate(self): def testAutoCloseFieldImmediate(self):
moderator.register(Entry, EntryModerator6) moderator.register(Entry, EntryModerator6)
c1, c2 = self.createSomeComments() c1, c2 = self.createSomeComments()
self.assertEqual(Comment.objects.all().count(), 0) self.assertEqual(Comment.objects.all().count(), 0)

4
tests/runtests.py
View File

@ -80,10 +80,6 @@ def setup(verbosity, test_labels):
settings.TEMPLATE_DIRS = (os.path.join(RUNTESTS_DIR, TEST_TEMPLATE_DIR),) settings.TEMPLATE_DIRS = (os.path.join(RUNTESTS_DIR, TEST_TEMPLATE_DIR),)
settings.LANGUAGE_CODE = 'en' settings.LANGUAGE_CODE = 'en'
settings.SITE_ID = 1 settings.SITE_ID = 1
# For testing comment-utils, we require the MANAGERS attribute
# to be set, so that a test email is sent out which we catch
# in our tests.
settings.MANAGERS = ("admin@djangoproject.com",)
# Load all the ALWAYS_INSTALLED_APPS. # Load all the ALWAYS_INSTALLED_APPS.
get_apps() get_apps()