Skip to content

Commit

Permalink
Renamed an assertion in the dispatch tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
timgraham committed Jan 2, 2015
1 parent 8958170 commit 937fab0
Showing 1 changed file with 9 additions and 10 deletions.
19 changes: 9 additions & 10 deletions tests/dispatch/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def a(self, val, **kwargs):
class DispatcherTests(unittest.TestCase):
"""Test suite for dispatcher (barely started)"""

def _testIsClean(self, signal):
def assertTestIsClean(self, signal):
"""Assert that everything has been cleaned up automatically"""
# Note that dead weakref cleanup happens as side effect of using
# the signal's receivers through the signals API. So, first do a
Expand All @@ -59,15 +59,15 @@ def test_exact(self):
result = a_signal.send(sender=self, val="test")
self.assertEqual(result, expected)
a_signal.disconnect(receiver_1_arg, sender=self)
self._testIsClean(a_signal)
self.assertTestIsClean(a_signal)

def test_ignored_sender(self):
a_signal.connect(receiver_1_arg)
expected = [(receiver_1_arg, "test")]
result = a_signal.send(sender=self, val="test")
self.assertEqual(result, expected)
a_signal.disconnect(receiver_1_arg)
self._testIsClean(a_signal)
self.assertTestIsClean(a_signal)

def test_garbage_collected(self):
a = Callable()
Expand All @@ -77,7 +77,7 @@ def test_garbage_collected(self):
garbage_collect()
result = a_signal.send(sender=self, val="test")
self.assertEqual(result, expected)
self._testIsClean(a_signal)
self.assertTestIsClean(a_signal)

def test_cached_garbaged_collected(self):
"""
Expand Down Expand Up @@ -111,7 +111,7 @@ def test_multiple_registration(self):
del a
del result
garbage_collect()
self._testIsClean(a_signal)
self.assertTestIsClean(a_signal)

def test_uid_registration(self):
def uid_based_receiver_1(**kwargs):
Expand All @@ -124,10 +124,10 @@ def uid_based_receiver_2(**kwargs):
a_signal.connect(uid_based_receiver_2, dispatch_uid="uid")
self.assertEqual(len(a_signal.receivers), 1)
a_signal.disconnect(dispatch_uid="uid")
self._testIsClean(a_signal)
self.assertTestIsClean(a_signal)

def test_robust(self):
"""Test the sendRobust function"""
"""Test the send_robust() function"""
def fails(val, **kwargs):
raise ValueError('this')
a_signal.connect(fails)
Expand All @@ -138,7 +138,7 @@ def fails(val, **kwargs):
self.assertTrue(hasattr(err, '__traceback__'))
self.assertTrue(isinstance(err.__traceback__, TracebackType))
a_signal.disconnect(fails)
self._testIsClean(a_signal)
self.assertTestIsClean(a_signal)

def test_disconnection(self):
receiver_1 = Callable()
Expand All @@ -151,7 +151,7 @@ def test_disconnection(self):
del receiver_2
garbage_collect()
a_signal.disconnect(receiver_3)
self._testIsClean(a_signal)
self.assertTestIsClean(a_signal)

def test_has_listeners(self):
self.assertFalse(a_signal.has_listeners())
Expand All @@ -168,7 +168,6 @@ def test_has_listeners(self):
class ReceiverTestCase(unittest.TestCase):
"""
Test suite for receiver.
"""
def test_receiver_single_signal(self):
@receiver(a_signal)
Expand Down

0 comments on commit 937fab0

Please sign in to comment.