Replace assertEqual([], items) with assertEmpty(items)
This patch is to replace assertEqual([], items) with assertEmpty(items), which the items is a empty list. Change-Id: Ibdd1e141740497b819e08ac8abeb74740b8a6cf9
This commit is contained in:
parent
9552aeffc0
commit
48b235f476
|
@ -65,7 +65,7 @@ class ServersAdminTestJSON(base.BaseV2ComputeAdminTest):
|
|||
params = {'status': 'invalid_status'}
|
||||
body = self.client.list_servers(detail=True, **params)
|
||||
servers = body['servers']
|
||||
self.assertEqual([], servers)
|
||||
self.assertEmpty(servers)
|
||||
|
||||
@decorators.idempotent_id('51717b38-bdc1-458b-b636-1cf82d99f62f')
|
||||
def test_list_servers_by_admin(self):
|
||||
|
|
|
@ -50,7 +50,7 @@ class ListServersNegativeTestJSON(base.BaseV2ComputeTest):
|
|||
servers = body['servers']
|
||||
actual = [srv for srv in servers
|
||||
if srv['id'] == self.deleted_id]
|
||||
self.assertEqual([], actual)
|
||||
self.assertEmpty(actual)
|
||||
|
||||
@decorators.attr(type=['negative'])
|
||||
@decorators.idempotent_id('ff01387d-c7ad-47b4-ae9e-64fa214638fe')
|
||||
|
@ -58,7 +58,7 @@ class ListServersNegativeTestJSON(base.BaseV2ComputeTest):
|
|||
# Listing servers for a non existing image returns empty list
|
||||
body = self.client.list_servers(image='non_existing_image')
|
||||
servers = body['servers']
|
||||
self.assertEqual([], servers)
|
||||
self.assertEmpty(servers)
|
||||
|
||||
@decorators.attr(type=['negative'])
|
||||
@decorators.idempotent_id('5913660b-223b-44d4-a651-a0fbfd44ca75')
|
||||
|
@ -66,7 +66,7 @@ class ListServersNegativeTestJSON(base.BaseV2ComputeTest):
|
|||
# Listing servers by non existing flavor returns empty list
|
||||
body = self.client.list_servers(flavor='non_existing_flavor')
|
||||
servers = body['servers']
|
||||
self.assertEqual([], servers)
|
||||
self.assertEmpty(servers)
|
||||
|
||||
@decorators.attr(type=['negative'])
|
||||
@decorators.idempotent_id('e2c77c4a-000a-4af3-a0bd-629a328bde7c')
|
||||
|
@ -74,7 +74,7 @@ class ListServersNegativeTestJSON(base.BaseV2ComputeTest):
|
|||
# Listing servers for a non existent server name returns empty list
|
||||
body = self.client.list_servers(name='non_existing_server_name')
|
||||
servers = body['servers']
|
||||
self.assertEqual([], servers)
|
||||
self.assertEmpty(servers)
|
||||
|
||||
@decorators.attr(type=['negative'])
|
||||
@decorators.idempotent_id('fcdf192d-0f74-4d89-911f-1ec002b822c4')
|
||||
|
@ -82,7 +82,7 @@ class ListServersNegativeTestJSON(base.BaseV2ComputeTest):
|
|||
# Return an empty list when invalid status is specified
|
||||
body = self.client.list_servers(status='non_existing_status')
|
||||
servers = body['servers']
|
||||
self.assertEqual([], servers)
|
||||
self.assertEmpty(servers)
|
||||
|
||||
@decorators.idempotent_id('12c80a9f-2dec-480e-882b-98ba15757659')
|
||||
def test_list_servers_by_limits(self):
|
||||
|
@ -138,4 +138,4 @@ class ListServersNegativeTestJSON(base.BaseV2ComputeTest):
|
|||
servers = body['servers']
|
||||
actual = [srv for srv in servers
|
||||
if srv['id'] == self.deleted_id]
|
||||
self.assertEqual([], actual)
|
||||
self.assertEmpty(actual)
|
||||
|
|
|
@ -134,4 +134,4 @@ class GroupsV3TestJSON(base.BaseIdentityV3AdminTest):
|
|||
for g in body:
|
||||
fetched_ids.append(g['id'])
|
||||
missing_groups = [g for g in group_ids if g not in fetched_ids]
|
||||
self.assertEqual([], missing_groups)
|
||||
self.assertEmpty(missing_groups)
|
||||
|
|
|
@ -58,7 +58,7 @@ class MetadataNamespaceTagsTest(base.BaseV2ImageTest):
|
|||
namespace['namespace'])
|
||||
body = self.namespace_tags_client.list_namespace_tags(
|
||||
namespace['namespace'])
|
||||
self.assertEqual([], body['tags'])
|
||||
self.assertEmpty(body['tags'])
|
||||
|
||||
@decorators.idempotent_id('a2a3765e-1a2c-3f6d-a3a7-3cc3466ab875')
|
||||
def test_create_update_delete_tag(self):
|
||||
|
|
|
@ -343,7 +343,7 @@ class VolumesListTestJSON(base.BaseVolumeTest):
|
|||
|
||||
# If cannot follow make sure it's because we have finished
|
||||
else:
|
||||
self.assertEqual([], remaining or [],
|
||||
self.assertEmpty(remaining or [],
|
||||
'No more pages reported, but still '
|
||||
'missing ids %s' % remaining)
|
||||
break
|
||||
|
|
Loading…
Reference in New Issue