Remove a special case for comment tests from runtests.py.
This commit is contained in:
parent
571b2d139b
commit
d056124269
|
@ -4,6 +4,7 @@ from django.contrib.comments.models import Comment
|
|||
from django.contrib.comments.moderation import (moderator, CommentModerator,
|
||||
AlreadyModerated)
|
||||
from django.core import mail
|
||||
from django.test.utils import override_settings
|
||||
|
||||
from . import CommentTestCase
|
||||
from ..models import Entry
|
||||
|
@ -67,9 +68,10 @@ class CommentUtilsModeratorTests(CommentTestCase):
|
|||
self.assertRaises(AlreadyModerated, moderator.register, Entry, EntryModerator1)
|
||||
|
||||
def testEmailNotification(self):
|
||||
moderator.register(Entry, EntryModerator1)
|
||||
self.createSomeComments()
|
||||
self.assertEqual(len(mail.outbox), 2)
|
||||
with override_settings(MANAGERS=("test@example.com",)):
|
||||
moderator.register(Entry, EntryModerator1)
|
||||
self.createSomeComments()
|
||||
self.assertEqual(len(mail.outbox), 2)
|
||||
|
||||
def testCommentsEnabled(self):
|
||||
moderator.register(Entry, EntryModerator2)
|
||||
|
@ -94,4 +96,4 @@ class CommentUtilsModeratorTests(CommentTestCase):
|
|||
def testAutoCloseFieldImmediate(self):
|
||||
moderator.register(Entry, EntryModerator6)
|
||||
c1, c2 = self.createSomeComments()
|
||||
self.assertEqual(Comment.objects.all().count(), 0)
|
||||
self.assertEqual(Comment.objects.all().count(), 0)
|
||||
|
|
|
@ -80,10 +80,6 @@ def setup(verbosity, test_labels):
|
|||
settings.TEMPLATE_DIRS = (os.path.join(RUNTESTS_DIR, TEST_TEMPLATE_DIR),)
|
||||
settings.LANGUAGE_CODE = 'en'
|
||||
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.
|
||||
get_apps()
|
||||
|
|
Loading…
Reference in New Issue