summaryrefslogtreecommitdiff
path: root/tests/regressiontests
diff options
context:
space:
mode:
authorJulien Phalip <jphalip@gmail.com>2013-02-08 12:12:03 -0800
committerJulien Phalip <jphalip@gmail.com>2013-02-08 12:12:03 -0800
commitdb09a2de6e1bc7121d301dad9610efcda9c7a925 (patch)
tree3313039d57cb3aefe9b4f07dbc99767aaa0811ac /tests/regressiontests
parent868e0f3cb4cc47418e43a08c373f0707e3cf301c (diff)
Cleaned up some lingering signals in the test suite that were causing spurious failures with Pypy and Postgres.
Diffstat (limited to 'tests/regressiontests')
-rw-r--r--tests/regressiontests/comment_tests/tests/moderation_view_tests.py6
-rw-r--r--tests/regressiontests/multiple_database/tests.py5
2 files changed, 11 insertions, 0 deletions
diff --git a/tests/regressiontests/comment_tests/tests/moderation_view_tests.py b/tests/regressiontests/comment_tests/tests/moderation_view_tests.py
index 0abeff9687..c932fed2d2 100644
--- a/tests/regressiontests/comment_tests/tests/moderation_view_tests.py
+++ b/tests/regressiontests/comment_tests/tests/moderation_view_tests.py
@@ -93,6 +93,8 @@ class FlagViewTests(CommentTestCase):
self.testFlagPost()
self.assertEqual(received_signals, [signals.comment_was_flagged])
+ signals.comment_was_flagged.disconnect(receive)
+
def makeModerator(username):
u = User.objects.get(username=username)
ct = ContentType.objects.get_for_model(Comment)
@@ -164,6 +166,8 @@ class DeleteViewTests(CommentTestCase):
self.testDeletePost()
self.assertEqual(received_signals, [signals.comment_was_flagged])
+ signals.comment_was_flagged.disconnect(receive)
+
def testDeletedView(self):
comments = self.createSomeComments()
pk = comments[0].pk
@@ -239,6 +243,8 @@ class ApproveViewTests(CommentTestCase):
self.testApprovePost()
self.assertEqual(received_signals, [signals.comment_was_flagged])
+ signals.comment_was_flagged.disconnect(receive)
+
def testApprovedView(self):
comments = self.createSomeComments()
pk = comments[0].pk
diff --git a/tests/regressiontests/multiple_database/tests.py b/tests/regressiontests/multiple_database/tests.py
index a79c9c0aa1..2bff7b3b66 100644
--- a/tests/regressiontests/multiple_database/tests.py
+++ b/tests/regressiontests/multiple_database/tests.py
@@ -1761,6 +1761,11 @@ class SignalTests(TestCase):
self.assertEqual(pre_delete_receiver._database, "other")
self.assertEqual(post_delete_receiver._database, "other")
+ signals.pre_save.disconnect(sender=Person, receiver=pre_save_receiver)
+ signals.post_save.disconnect(sender=Person, receiver=post_save_receiver)
+ signals.pre_delete.disconnect(sender=Person, receiver=pre_delete_receiver)
+ signals.post_delete.disconnect(sender=Person, receiver=post_delete_receiver)
+
def test_database_arg_m2m(self):
"""
Test that the m2m_changed signal has a correct database arg (#13552)