Merge "assertEquals is deprecated, use assertEqual"

This commit is contained in:
Jenkins 2016-01-26 23:59:37 +00:00 committed by Gerrit Code Review
commit 1ada938a28
2 changed files with 4 additions and 4 deletions

View File

@ -279,7 +279,7 @@ class RpcReplyPikaIncomingMessageTestCase(unittest.TestCase):
self.assertEqual(message.msg_id, 123456789)
self.assertIsNone(message.failure)
self.assertEquals(message.result, "all fine")
self.assertEqual(message.result, "all fine")
def test_negative_reply_message_body_parsing(self):
@ -299,7 +299,7 @@ class RpcReplyPikaIncomingMessageTestCase(unittest.TestCase):
self.assertEqual(message.msg_id, 123456789)
self.assertIsNone(message.result)
self.assertEquals(
self.assertEqual(
str(message.failure),
'Error message\n'
'TRACE HERE'
@ -525,7 +525,7 @@ class RpcPikaOutgoingMessageTestCase(unittest.TestCase):
self.assertTrue(expiration * 1000 - float(props.expiration) < 100)
self.assertEqual(props.headers, {'version': '1.0'})
self.assertEqual(props.correlation_id, message.msg_id)
self.assertEquals(props.reply_to, reply_queue_name)
self.assertEqual(props.reply_to, reply_queue_name)
self.assertTrue(props.message_id)

View File

@ -101,7 +101,7 @@ class TestKafkaDriver(test_utils.BaseTestCase):
with mock.patch.object(
kafka_driver.Connection, 'notify_send') as fake_send:
self.driver.send_notification(target, {}, {}, None)
self.assertEquals(1, len(fake_send.mock_calls))
self.assertEqual(1, len(fake_send.mock_calls))
def test_listen(self):
target = oslo_messaging.Target(topic="topic_test")