From 2277b294db7c48db15890802c85a6e0dcbb6a6a3 Mon Sep 17 00:00:00 2001 From: Cao Xuan Hoang Date: Wed, 28 Sep 2016 09:32:36 +0700 Subject: [PATCH] Using assertIsNone() instead of assertEqual(None, ...) Following OpenStack Style Guidelines[1]: [H203] Unit test assertions tend to give better messages for more specific assertions. As a result, assertIsNone(...) is preferred over assertEqual(None, ...) and assertIs(None, ...) [1] http://docs.openstack.org/developer/hacking/#unit-tests-and-assertraises Change-Id: I57c45877df8055911c28b31a679549d65398a18e --- .../tests/unit/engine/rpc_backend/kombu/test_kombu_client.py | 2 +- .../tests/unit/engine/rpc_backend/kombu/test_kombu_server.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mistral/tests/unit/engine/rpc_backend/kombu/test_kombu_client.py b/mistral/tests/unit/engine/rpc_backend/kombu/test_kombu_client.py index f9a00d399..755f40067 100644 --- a/mistral/tests/unit/engine/rpc_backend/kombu/test_kombu_client.py +++ b/mistral/tests/unit/engine/rpc_backend/kombu/test_kombu_client.py @@ -120,7 +120,7 @@ class KombuClientTestCase(base.KombuTestCase): get_thread_local.side_effect = side_effect response = self.client.async_call(self.ctx, 'method') - self.assertEqual(response, None) + self.assertIsNone(response) # check if consumer.consume was called once self.assertEqual(self.client.consumer.consume.call_count, 1) diff --git a/mistral/tests/unit/engine/rpc_backend/kombu/test_kombu_server.py b/mistral/tests/unit/engine/rpc_backend/kombu/test_kombu_server.py index aee26d12c..8c3a189a0 100644 --- a/mistral/tests/unit/engine/rpc_backend/kombu/test_kombu_server.py +++ b/mistral/tests/unit/engine/rpc_backend/kombu/test_kombu_server.py @@ -122,7 +122,7 @@ class KombuServerTestCase(base.KombuTestCase): acquire_mock.drain_events.side_effect = KeyboardInterrupt() fake_kombu.connection.acquire.return_value = acquire_mock - self.assertEqual(self.server.run(), None) + self.assertIsNone(self.server.run()) self.assertFalse(self.server.is_running) @mock.patch.object(