openstack
/
oslo.messaging
Code Issues Proposed changes

Merge "assertIsNone(val) instead of assertEqual(None,val)"

This commit is contained in:
Jenkins 2015-12-22 06:32:28 +00:00 committed by Gerrit Code Review
parent 3490c6fa62 417f079c2b
commit c9fe899d2a
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oslo_messaging/tests/drivers/test_impl_kafka.py
View File

@ -285,4 +285,4 @@ class TestWithRealKafkaBroker(test_utils.BaseTestCase):
deadline = time.time() + 3
received_message = listener.poll(timeout=3)
self.assertEqual(0, int(deadline - time.time()))
self.assertEqual(None, received_message)
self.assertIsNone(received_message)

4
oslo_messaging/tests/notify/test_logger.py
View File

@ -84,7 +84,7 @@ class TestLogNotifier(test_utils.BaseTestCase):
n['priority'])
self.assertEqual('logrecord', n['event_type'])
self.assertEqual(str(timeutils.utcnow()), n['timestamp'])
self.assertEqual(None, n['publisher_id'])
self.assertIsNone(n['publisher_id'])
self.assertEqual(
{'process': os.getpid(),
'funcName': None,
@ -134,7 +134,7 @@ class TestLogNotifier(test_utils.BaseTestCase):
n['priority'])
self.assertEqual('logrecord', n['event_type'])
self.assertEqual(str(timeutils.utcnow()), n['timestamp'])
self.assertEqual(None, n['publisher_id'])
self.assertIsNone(n['publisher_id'])
pathname = __file__
if pathname.endswith(('.pyc', '.pyo')):
pathname = pathname[:-1]

3
oslo_messaging/tests/test_fixture.py
View File

@ -76,7 +76,6 @@ class TestConfFixture(test_utils.BaseTestCase):
self.assertEqual([],
conf.oslo_messaging_notifications.driver)
self.assertEqual(None,
conf.oslo_messaging_notifications.transport_url)
self.assertIsNone(conf.oslo_messaging_notifications.transport_url)
self.assertEqual(['notifications'],
conf.oslo_messaging_notifications.topics)

2
oslo_messaging/tests/test_utils.py
View File

@ -56,7 +56,7 @@ class TimerTestCase(test_utils.BaseTestCase):
t = common.DecayingTimer()
t.start()
remaining = t.check_return()
self.assertEqual(None, remaining)
self.assertIsNone(remaining)
def test_no_duration_but_maximum(self):
t = common.DecayingTimer()