diff --git a/tests/appservice/test_scheduler.py b/tests/appservice/test_scheduler.py
index b9dc4dfe1b..1cbb059357 100644
--- a/tests/appservice/test_scheduler.py
+++ b/tests/appservice/test_scheduler.py
@@ -71,7 +71,7 @@ class ApplicationServiceSchedulerTransactionCtrlTestCase(unittest.TestCase):
one_time_key_counts={},
unused_fallback_keys={},
)
- self.assertEquals(0, len(self.txnctrl.recoverers)) # no recoverer made
+ self.assertEqual(0, len(self.txnctrl.recoverers)) # no recoverer made
txn.complete.assert_called_once_with(self.store) # txn completed
def test_single_service_down(self):
@@ -97,8 +97,8 @@ class ApplicationServiceSchedulerTransactionCtrlTestCase(unittest.TestCase):
one_time_key_counts={},
unused_fallback_keys={},
)
- self.assertEquals(0, txn.send.call_count) # txn not sent though
- self.assertEquals(0, txn.complete.call_count) # or completed
+ self.assertEqual(0, txn.send.call_count) # txn not sent though
+ self.assertEqual(0, txn.complete.call_count) # or completed
def test_single_service_up_txn_not_sent(self):
# Test: The AS is up and the txn is not sent. A Recoverer is made and
@@ -125,10 +125,10 @@ class ApplicationServiceSchedulerTransactionCtrlTestCase(unittest.TestCase):
one_time_key_counts={},
unused_fallback_keys={},
)
- self.assertEquals(1, self.recoverer_fn.call_count) # recoverer made
- self.assertEquals(1, self.recoverer.recover.call_count) # and invoked
- self.assertEquals(1, len(self.txnctrl.recoverers)) # and stored
- self.assertEquals(0, txn.complete.call_count) # txn not completed
+ self.assertEqual(1, self.recoverer_fn.call_count) # recoverer made
+ self.assertEqual(1, self.recoverer.recover.call_count) # and invoked
+ self.assertEqual(1, len(self.txnctrl.recoverers)) # and stored
+ self.assertEqual(0, txn.complete.call_count) # txn not completed
self.store.set_appservice_state.assert_called_once_with(
service, ApplicationServiceState.DOWN # service marked as down
)
@@ -161,17 +161,17 @@ class ApplicationServiceSchedulerRecovererTestCase(unittest.TestCase):
self.recoverer.recover()
# shouldn't have called anything prior to waiting for exp backoff
- self.assertEquals(0, self.store.get_oldest_unsent_txn.call_count)
+ self.assertEqual(0, self.store.get_oldest_unsent_txn.call_count)
txn.send = simple_async_mock(True)
txn.complete = simple_async_mock(None)
# wait for exp backoff
self.clock.advance_time(2)
- self.assertEquals(1, txn.send.call_count)
- self.assertEquals(1, txn.complete.call_count)
+ self.assertEqual(1, txn.send.call_count)
+ self.assertEqual(1, txn.complete.call_count)
# 2 because it needs to get None to know there are no more txns
- self.assertEquals(2, self.store.get_oldest_unsent_txn.call_count)
+ self.assertEqual(2, self.store.get_oldest_unsent_txn.call_count)
self.callback.assert_called_once_with(self.recoverer)
- self.assertEquals(self.recoverer.service, self.service)
+ self.assertEqual(self.recoverer.service, self.service)
def test_recover_retry_txn(self):
txn = Mock()
@@ -187,26 +187,26 @@ class ApplicationServiceSchedulerRecovererTestCase(unittest.TestCase):
self.store.get_oldest_unsent_txn = Mock(side_effect=take_txn)
self.recoverer.recover()
- self.assertEquals(0, self.store.get_oldest_unsent_txn.call_count)
+ self.assertEqual(0, self.store.get_oldest_unsent_txn.call_count)
txn.send = simple_async_mock(False)
txn.complete = simple_async_mock(None)
self.clock.advance_time(2)
- self.assertEquals(1, txn.send.call_count)
- self.assertEquals(0, txn.complete.call_count)
- self.assertEquals(0, self.callback.call_count)
+ self.assertEqual(1, txn.send.call_count)
+ self.assertEqual(0, txn.complete.call_count)
+ self.assertEqual(0, self.callback.call_count)
self.clock.advance_time(4)
- self.assertEquals(2, txn.send.call_count)
- self.assertEquals(0, txn.complete.call_count)
- self.assertEquals(0, self.callback.call_count)
+ self.assertEqual(2, txn.send.call_count)
+ self.assertEqual(0, txn.complete.call_count)
+ self.assertEqual(0, self.callback.call_count)
self.clock.advance_time(8)
- self.assertEquals(3, txn.send.call_count)
- self.assertEquals(0, txn.complete.call_count)
- self.assertEquals(0, self.callback.call_count)
+ self.assertEqual(3, txn.send.call_count)
+ self.assertEqual(0, txn.complete.call_count)
+ self.assertEqual(0, self.callback.call_count)
txn.send = simple_async_mock(True) # successfully send the txn
pop_txn = True # returns the txn the first time, then no more.
self.clock.advance_time(16)
- self.assertEquals(1, txn.send.call_count) # new mock reset call count
- self.assertEquals(1, txn.complete.call_count)
+ self.assertEqual(1, txn.send.call_count) # new mock reset call count
+ self.assertEqual(1, txn.complete.call_count)
self.callback.assert_called_once_with(self.recoverer)
@@ -241,13 +241,13 @@ class ApplicationServiceSchedulerQueuerTestCase(unittest.HomeserverTestCase):
self.scheduler.enqueue_for_appservice(service, events=[event2])
self.scheduler.enqueue_for_appservice(service, events=[event3])
self.txn_ctrl.send.assert_called_with(service, [event], [], [], None, None)
- self.assertEquals(1, self.txn_ctrl.send.call_count)
+ self.assertEqual(1, self.txn_ctrl.send.call_count)
# Resolve the send event: expect the queued events to be sent
d.callback(service)
self.txn_ctrl.send.assert_called_with(
service, [event2, event3], [], [], None, None
)
- self.assertEquals(2, self.txn_ctrl.send.call_count)
+ self.assertEqual(2, self.txn_ctrl.send.call_count)
def test_multiple_service_queues(self):
# Tests that each service has its own queue, and that they don't block
@@ -281,7 +281,7 @@ class ApplicationServiceSchedulerQueuerTestCase(unittest.HomeserverTestCase):
# service
srv_2_defer.callback(srv2)
self.txn_ctrl.send.assert_called_with(srv2, [srv_2_event2], [], [], None, None)
- self.assertEquals(3, self.txn_ctrl.send.call_count)
+ self.assertEqual(3, self.txn_ctrl.send.call_count)
def test_send_large_txns(self):
srv_1_defer = defer.Deferred()
@@ -312,7 +312,7 @@ class ApplicationServiceSchedulerQueuerTestCase(unittest.HomeserverTestCase):
self.txn_ctrl.send.assert_called_with(
service, event_list[101:], [], [], None, None
)
- self.assertEquals(3, self.txn_ctrl.send.call_count)
+ self.assertEqual(3, self.txn_ctrl.send.call_count)
def test_send_single_ephemeral_no_queue(self):
# Expect the event to be sent immediately.
@@ -346,14 +346,14 @@ class ApplicationServiceSchedulerQueuerTestCase(unittest.HomeserverTestCase):
self.scheduler.enqueue_for_appservice(service, ephemeral=event_list_2)
self.scheduler.enqueue_for_appservice(service, ephemeral=event_list_3)
self.txn_ctrl.send.assert_called_with(service, [], event_list_1, [], None, None)
- self.assertEquals(1, self.txn_ctrl.send.call_count)
+ self.assertEqual(1, self.txn_ctrl.send.call_count)
# Resolve txn_ctrl.send
d.callback(service)
# Expect the queued events to be sent
self.txn_ctrl.send.assert_called_with(
service, [], event_list_2 + event_list_3, [], None, None
)
- self.assertEquals(2, self.txn_ctrl.send.call_count)
+ self.assertEqual(2, self.txn_ctrl.send.call_count)
def test_send_large_txns_ephemeral(self):
d = defer.Deferred()
@@ -369,4 +369,4 @@ class ApplicationServiceSchedulerQueuerTestCase(unittest.HomeserverTestCase):
)
d.callback(service)
self.txn_ctrl.send.assert_called_with(service, [], second_chunk, [], None, None)
- self.assertEquals(2, self.txn_ctrl.send.call_count)
+ self.assertEqual(2, self.txn_ctrl.send.call_count)
|
