From 89ad44d746634960635a895441055dfcce023413 Mon Sep 17 00:00:00 2001 From: gecong1973 Date: Sat, 8 Oct 2016 10:08:44 +0800 Subject: [PATCH] Change assertTrue(isinstance()) by optimal assert Some of tests use different method of assertTrue(isinstance(A, B)) or assertEqual(type(A), B). The correct way is to use assertIsInstance(A, B) provided by testtools Change-Id: Ic741b987fa184b9e9efb22750b8d8245c6c62676 --- tests/unit/queues/test_client.py | 4 ++-- tests/unit/transport/test_request.py | 14 +++++++------- zaqarclient/tests/queues/claims.py | 2 +- zaqarclient/tests/queues/flavor.py | 2 +- zaqarclient/tests/queues/health.py | 2 +- zaqarclient/tests/queues/pool.py | 2 +- zaqarclient/tests/queues/queues.py | 12 ++++++------ 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/tests/unit/queues/test_client.py b/tests/unit/queues/test_client.py index 0807ebbf..93d59fa8 100644 --- a/tests/unit/queues/test_client.py +++ b/tests/unit/queues/test_client.py @@ -24,8 +24,8 @@ class TestClient(base.TestBase): version = list(client._CLIENTS.keys())[0] cli = client.Client('http://example.com', version, {}) - self.assertTrue(isinstance(cli, - client._CLIENTS[version])) + self.assertIsInstance(cli, + client._CLIENTS[version]) def test_version_failure(self): self.assertRaises(errors.ZaqarError, diff --git a/tests/unit/transport/test_request.py b/tests/unit/transport/test_request.py index 6104c1e7..53f11470 100644 --- a/tests/unit/transport/test_request.py +++ b/tests/unit/transport/test_request.py @@ -37,34 +37,34 @@ class TestRequest(base.TestBase): def test_prepare_request(self): auth_opts = self.conf.get('auth_opts', {}) req = request.prepare_request(auth_opts) - self.assertTrue(isinstance(req, request.Request)) + self.assertIsInstance(req, request.Request) self.assertIsNone(req.content) def test_prepare_request_with_data(self): auth_opts = self.conf.get('auth_opts', {}) data = {"data": "tons of GBs"} req = request.prepare_request(auth_opts, data=data) - self.assertTrue(isinstance(req, request.Request)) + self.assertIsInstance(req, request.Request) self.assertEqual(json.dumps(data), req.content) def test_request_with_right_version(self): auth_opts = self.conf.get('auth_opts', {}) api_version = 1 req = request.prepare_request(auth_opts, api=api_version) - self.assertTrue(isinstance(req.api, api_v1.V1)) + self.assertIsInstance(req.api, api_v1.V1) api_version = 1.0 req = request.prepare_request(auth_opts, api=api_version) - self.assertTrue(isinstance(req.api, api_v1.V1)) + self.assertIsInstance(req.api, api_v1.V1) api_version = 1.1 req = request.prepare_request(auth_opts, api=api_version) - self.assertTrue(isinstance(req.api, api_v1.V1_1)) + self.assertIsInstance(req.api, api_v1.V1_1) api_version = 2 req = request.prepare_request(auth_opts, api=api_version) - self.assertTrue(isinstance(req.api, api_v2.V2)) + self.assertIsInstance(req.api, api_v2.V2) api_version = 2.0 req = request.prepare_request(auth_opts, api=api_version) - self.assertTrue(isinstance(req.api, api_v2.V2)) + self.assertIsInstance(req.api, api_v2.V2) diff --git a/zaqarclient/tests/queues/claims.py b/zaqarclient/tests/queues/claims.py index e3741d5f..744ec319 100644 --- a/zaqarclient/tests/queues/claims.py +++ b/zaqarclient/tests/queues/claims.py @@ -129,7 +129,7 @@ class QueuesV1ClaimFunctionalTest(base.QueuesTestBase): queue.post(messages) messages = queue.claim(ttl=120, grace=120) - self.assertTrue(isinstance(messages, claim.Claim)) + self.assertIsInstance(messages, claim.Claim) self.assertGreaterEqual(len(list(messages)), 0) def test_claim_get_functional(self): diff --git a/zaqarclient/tests/queues/flavor.py b/zaqarclient/tests/queues/flavor.py index 30228883..7ee3a2d3 100644 --- a/zaqarclient/tests/queues/flavor.py +++ b/zaqarclient/tests/queues/flavor.py @@ -171,7 +171,7 @@ class QueuesV1_1FlavorFunctionalTest(base.QueuesTestBase): self.addCleanup(flavor.delete) flavors = self.client.flavors() - self.assertTrue(isinstance(flavors, iterator._Iterator)) + self.assertIsInstance(flavors, iterator._Iterator) self.assertEqual(1, len(list(flavors))) def test_flavor_delete(self): diff --git a/zaqarclient/tests/queues/health.py b/zaqarclient/tests/queues/health.py index 9d6dd38c..fa812433 100644 --- a/zaqarclient/tests/queues/health.py +++ b/zaqarclient/tests/queues/health.py @@ -48,4 +48,4 @@ class QueuesV2HealthFunctionalTest(base.QueuesTestBase): health = self.client.health() # NOTE(flwang): If everything is ok, then zaqar server will return a # JSON(dict). - self.assertTrue(isinstance(health, dict)) + self.assertIsInstance(health, dict) diff --git a/zaqarclient/tests/queues/pool.py b/zaqarclient/tests/queues/pool.py index 40fe5caf..139fb154 100644 --- a/zaqarclient/tests/queues/pool.py +++ b/zaqarclient/tests/queues/pool.py @@ -168,7 +168,7 @@ class QueuesV1_1PoolFunctionalTest(base.QueuesTestBase): self.addCleanup(pool.delete) pools = self.client.pools() - self.assertTrue(isinstance(pools, iterator._Iterator)) + self.assertIsInstance(pools, iterator._Iterator) self.assertEqual(1, len(list(pools))) def test_pool_delete(self): diff --git a/zaqarclient/tests/queues/queues.py b/zaqarclient/tests/queues/queues.py index 0b94a1f2..63b4eb3b 100644 --- a/zaqarclient/tests/queues/queues.py +++ b/zaqarclient/tests/queues/queues.py @@ -314,7 +314,7 @@ class QueuesV1QueueFunctionalTest(base.QueuesTestBase): queue.post(messages) messages = queue.messages() - self.assertTrue(isinstance(messages, iterator._Iterator)) + self.assertIsInstance(messages, iterator._Iterator) self.assertGreaterEqual(len(list(messages)), 0) def test_message_list_echo_functional(self): @@ -329,7 +329,7 @@ class QueuesV1QueueFunctionalTest(base.QueuesTestBase): ] queue.post(messages) messages = queue.messages(echo=True) - self.assertTrue(isinstance(messages, iterator._Iterator)) + self.assertIsInstance(messages, iterator._Iterator) self.assertGreaterEqual(len(list(messages)), 3) def test_message_get_functional(self): @@ -346,7 +346,7 @@ class QueuesV1QueueFunctionalTest(base.QueuesTestBase): res = queue.post(messages)['resources'] msg_id = res[0].split('/')[-1] msg = queue.message(msg_id) - self.assertTrue(isinstance(msg, message.Message)) + self.assertIsInstance(msg, message.Message) self.assertEqual(res[0], msg.href) def test_message_get_many_functional(self): @@ -363,7 +363,7 @@ class QueuesV1QueueFunctionalTest(base.QueuesTestBase): res = queue.post(messages)['resources'] msgs_id = [ref.split('/')[-1] for ref in res] messages = queue.messages(*msgs_id) - self.assertTrue(isinstance(messages, iterator._Iterator)) + self.assertIsInstance(messages, iterator._Iterator) messages = list(messages) length = len(messages) if length == 3: @@ -472,7 +472,7 @@ class QueuesV1_1QueueFunctionalTest(QueuesV1QueueFunctionalTest): queue.post(messages) messages = queue.pop(count=2) - self.assertTrue(isinstance(messages, iterator._Iterator)) + self.assertIsInstance(messages, iterator._Iterator) self.assertEqual(2, len(list(messages))) remaining = queue.messages(echo=True) @@ -594,7 +594,7 @@ class QueuesV2QueueFunctionalTest(QueuesV1_1QueueFunctionalTest): subscriber='http://trigger.you') get_subscriptions = queue.subscriptions() - self.assertTrue(isinstance(get_subscriptions, iterator._Iterator)) + self.assertIsInstance(get_subscriptions, iterator._Iterator) self.assertEqual(2, len(list(get_subscriptions))) def test_queue_metadata_reload_functional(self):