openstack/python-zaqarclient
Code Issues Proposed changes

Change assertTrue(isinstance()) by optimal assert

Browse Source 
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
This commit is contained in:
gecong1973 2016-10-08 10:08:44 +08:00
parent c57b67abf8
commit 89ad44d746
7 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/unit/queues/test_client.py
View File

@ -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,

14
tests/unit/transport/test_request.py
View File

@ -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)

2
zaqarclient/tests/queues/claims.py
View File

@ -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):

2
zaqarclient/tests/queues/flavor.py
View File

@ -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):

2
zaqarclient/tests/queues/health.py
View File

@ -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)

2
zaqarclient/tests/queues/pool.py
View File

@ -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):

12
zaqarclient/tests/queues/queues.py
View File

@ -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):