Replace deprecated assertDictContainsSubset
The method is deprecated since Python 3.2[1] and shows the following DeprecationWarning. /usr/lib/python3.9/unittest/case.py:1134: DeprecationWarning: assertDictContainsSubset is deprecated warnings.warn('assertDictContainsSubset is deprecated', [1] https://docs.python.org/3/whatsnew/3.2.html#unittest Closes-Bug: #1938103 Change-Id: I2372c6f1c748a5cb1c3fcf0566684f49bc5ef715
This commit is contained in:
parent
50f0a50cf4
commit
d9cd6b7347
@ -3694,9 +3694,9 @@ class ImpliedRoleTests(AssignmentTestHelperMixin):
|
||||
expected_implied_role_ref = {
|
||||
'prior_role_id': prior_role_ref['id'],
|
||||
'implied_role_id': implied_role_ref['id']}
|
||||
self.assertDictContainsSubset(
|
||||
expected_implied_role_ref,
|
||||
implied_role)
|
||||
self.assertLessEqual(
|
||||
expected_implied_role_ref.items(),
|
||||
implied_role.items())
|
||||
|
||||
PROVIDERS.role_api.delete_implied_role(
|
||||
prior_role_ref['id'],
|
||||
|
@ -111,20 +111,23 @@ class CatalogTests(object):
|
||||
PROVIDERS.catalog_api.get_region(region_id)
|
||||
# update the region bypassing catalog_api
|
||||
PROVIDERS.catalog_api.driver.update_region(region_id, updated_region)
|
||||
self.assertDictContainsSubset(
|
||||
new_region, PROVIDERS.catalog_api.get_region(region_id)
|
||||
self.assertLessEqual(
|
||||
new_region.items(),
|
||||
PROVIDERS.catalog_api.get_region(region_id).items()
|
||||
)
|
||||
PROVIDERS.catalog_api.get_region.invalidate(
|
||||
PROVIDERS.catalog_api, region_id
|
||||
)
|
||||
self.assertDictContainsSubset(
|
||||
updated_region, PROVIDERS.catalog_api.get_region(region_id)
|
||||
self.assertLessEqual(
|
||||
updated_region.items(),
|
||||
PROVIDERS.catalog_api.get_region(region_id).items()
|
||||
)
|
||||
# delete the region
|
||||
PROVIDERS.catalog_api.driver.delete_region(region_id)
|
||||
# still get the old region
|
||||
self.assertDictContainsSubset(
|
||||
updated_region, PROVIDERS.catalog_api.get_region(region_id)
|
||||
self.assertLessEqual(
|
||||
updated_region.items(),
|
||||
PROVIDERS.catalog_api.get_region(region_id).items()
|
||||
)
|
||||
PROVIDERS.catalog_api.get_region.invalidate(
|
||||
PROVIDERS.catalog_api, region_id
|
||||
@ -342,20 +345,23 @@ class CatalogTests(object):
|
||||
PROVIDERS.catalog_api.driver.update_service(
|
||||
service_id, updated_service
|
||||
)
|
||||
self.assertDictContainsSubset(
|
||||
new_service, PROVIDERS.catalog_api.get_service(service_id)
|
||||
self.assertLessEqual(
|
||||
new_service.items(),
|
||||
PROVIDERS.catalog_api.get_service(service_id).items()
|
||||
)
|
||||
PROVIDERS.catalog_api.get_service.invalidate(
|
||||
PROVIDERS.catalog_api, service_id
|
||||
)
|
||||
self.assertDictContainsSubset(
|
||||
updated_service, PROVIDERS.catalog_api.get_service(service_id)
|
||||
self.assertLessEqual(
|
||||
updated_service.items(),
|
||||
PROVIDERS.catalog_api.get_service(service_id).items()
|
||||
)
|
||||
|
||||
# delete bypassing catalog api
|
||||
PROVIDERS.catalog_api.driver.delete_service(service_id)
|
||||
self.assertDictContainsSubset(
|
||||
updated_service, PROVIDERS.catalog_api.get_service(service_id)
|
||||
self.assertLessEqual(
|
||||
updated_service.items(),
|
||||
PROVIDERS.catalog_api.get_service(service_id).items()
|
||||
)
|
||||
PROVIDERS.catalog_api.get_service.invalidate(
|
||||
PROVIDERS.catalog_api, service_id
|
||||
@ -416,12 +422,12 @@ class CatalogTests(object):
|
||||
PROVIDERS.catalog_api.get_endpoint(endpoint['id'])
|
||||
# delete the service bypassing catalog api
|
||||
PROVIDERS.catalog_api.driver.delete_service(service['id'])
|
||||
self.assertDictContainsSubset(endpoint,
|
||||
PROVIDERS.catalog_api.
|
||||
get_endpoint(endpoint['id']))
|
||||
self.assertDictContainsSubset(service,
|
||||
PROVIDERS.catalog_api.
|
||||
get_service(service['id']))
|
||||
self.assertLessEqual(
|
||||
endpoint.items(),
|
||||
PROVIDERS.catalog_api.get_endpoint(endpoint['id']).items())
|
||||
self.assertLessEqual(
|
||||
service.items(),
|
||||
PROVIDERS.catalog_api.get_service(service['id']).items())
|
||||
PROVIDERS.catalog_api.get_endpoint.invalidate(
|
||||
PROVIDERS.catalog_api, endpoint['id']
|
||||
)
|
||||
|
@ -91,7 +91,7 @@ class IdentityTests(object):
|
||||
# it easier to authenticate in tests, but should
|
||||
# not be returned by the api
|
||||
user.pop('password')
|
||||
self.assertDictContainsSubset(user, user_ref)
|
||||
self.assertLessEqual(user.items(), user_ref.items())
|
||||
role_list = PROVIDERS.assignment_api.get_roles_for_user_and_project(
|
||||
new_user['id'], self.project_baz['id'])
|
||||
self.assertEqual(1, len(role_list))
|
||||
@ -164,12 +164,14 @@ class IdentityTests(object):
|
||||
PROVIDERS.identity_api.get_user(ref['id'])
|
||||
# update using identity api and get back updated user.
|
||||
user_updated = PROVIDERS.identity_api.update_user(ref['id'], user)
|
||||
self.assertDictContainsSubset(
|
||||
PROVIDERS.identity_api.get_user(ref['id']), user_updated
|
||||
self.assertLessEqual(
|
||||
PROVIDERS.identity_api.get_user(ref['id']).items(),
|
||||
user_updated.items()
|
||||
)
|
||||
self.assertDictContainsSubset(
|
||||
self.assertLessEqual(
|
||||
PROVIDERS.identity_api.get_user_by_name(
|
||||
ref['name'], ref['domain_id']), user_updated
|
||||
ref['name'], ref['domain_id']).items(),
|
||||
user_updated.items()
|
||||
)
|
||||
|
||||
def test_get_user_returns_not_found(self):
|
||||
@ -215,15 +217,16 @@ class IdentityTests(object):
|
||||
)
|
||||
user['description'] = uuid.uuid4().hex
|
||||
user_updated = PROVIDERS.identity_api.update_user(ref['id'], user)
|
||||
self.assertDictContainsSubset(
|
||||
PROVIDERS.identity_api.get_user(ref['id']), user_updated
|
||||
self.assertLessEqual(
|
||||
PROVIDERS.identity_api.get_user(ref['id']).items(),
|
||||
user_updated.items()
|
||||
)
|
||||
self.assertDictContainsSubset(
|
||||
self.assertLessEqual(
|
||||
PROVIDERS.identity_api.get_user_by_name(
|
||||
ref['name'],
|
||||
ref['domain_id']
|
||||
),
|
||||
user_updated
|
||||
).items(),
|
||||
user_updated.items()
|
||||
)
|
||||
|
||||
def test_get_user_by_name_returns_not_found(self):
|
||||
@ -833,12 +836,12 @@ class IdentityTests(object):
|
||||
group = unit.new_group_ref(domain_id=domain['id'])
|
||||
group = PROVIDERS.identity_api.create_group(group)
|
||||
group_ref = PROVIDERS.identity_api.get_group(group['id'])
|
||||
self.assertDictContainsSubset(group, group_ref)
|
||||
self.assertLessEqual(group.items(), group_ref.items())
|
||||
|
||||
group['name'] = uuid.uuid4().hex
|
||||
PROVIDERS.identity_api.update_group(group['id'], group)
|
||||
group_ref = PROVIDERS.identity_api.get_group(group['id'])
|
||||
self.assertDictContainsSubset(group, group_ref)
|
||||
self.assertLessEqual(group.items(), group_ref.items())
|
||||
|
||||
PROVIDERS.identity_api.delete_group(group['id'])
|
||||
self.assertRaises(exception.GroupNotFound,
|
||||
@ -908,8 +911,9 @@ class IdentityTests(object):
|
||||
group['name'] = uuid.uuid4().hex
|
||||
group_ref = PROVIDERS.identity_api.update_group(group['id'], group)
|
||||
# after updating through identity api, get updated group
|
||||
self.assertDictContainsSubset(
|
||||
PROVIDERS.identity_api.get_group(group['id']), group_ref
|
||||
self.assertLessEqual(
|
||||
PROVIDERS.identity_api.get_group(group['id']).items(),
|
||||
group_ref.items()
|
||||
)
|
||||
|
||||
def test_create_duplicate_group_name_fails(self):
|
||||
@ -950,14 +954,14 @@ class IdentityTests(object):
|
||||
user_ref = PROVIDERS.identity_api.get_user(user['id'])
|
||||
del user_dict['password']
|
||||
user_ref_dict = {x: user_ref[x] for x in user_ref}
|
||||
self.assertDictContainsSubset(user_dict, user_ref_dict)
|
||||
self.assertLessEqual(user_dict.items(), user_ref_dict.items())
|
||||
|
||||
user_dict['password'] = uuid.uuid4().hex
|
||||
PROVIDERS.identity_api.update_user(user['id'], user_dict)
|
||||
user_ref = PROVIDERS.identity_api.get_user(user['id'])
|
||||
del user_dict['password']
|
||||
user_ref_dict = {x: user_ref[x] for x in user_ref}
|
||||
self.assertDictContainsSubset(user_dict, user_ref_dict)
|
||||
self.assertLessEqual(user_dict.items(), user_ref_dict.items())
|
||||
|
||||
PROVIDERS.identity_api.delete_user(user['id'])
|
||||
self.assertRaises(exception.UserNotFound,
|
||||
|
@ -847,12 +847,12 @@ class ResourceTests(object):
|
||||
project = unit.new_project_ref(domain_id=domain['id'])
|
||||
PROVIDERS.resource_api.create_project(project['id'], project)
|
||||
project_ref = PROVIDERS.resource_api.get_project(project['id'])
|
||||
self.assertDictContainsSubset(project, project_ref)
|
||||
self.assertLessEqual(project.items(), project_ref.items())
|
||||
|
||||
project['name'] = uuid.uuid4().hex
|
||||
PROVIDERS.resource_api.update_project(project['id'], project)
|
||||
project_ref = PROVIDERS.resource_api.get_project(project['id'])
|
||||
self.assertDictContainsSubset(project, project_ref)
|
||||
self.assertLessEqual(project.items(), project_ref.items())
|
||||
|
||||
PROVIDERS.resource_api.delete_project(project['id'])
|
||||
self.assertRaises(exception.ProjectNotFound,
|
||||
@ -1381,20 +1381,23 @@ class ResourceTests(object):
|
||||
domain_id, updated_project_domain_ref
|
||||
)
|
||||
# Verify get_domain still returns the domain
|
||||
self.assertDictContainsSubset(
|
||||
domain_ref, PROVIDERS.resource_api.get_domain(domain_id))
|
||||
self.assertLessEqual(
|
||||
domain_ref.items(),
|
||||
PROVIDERS.resource_api.get_domain(domain_id).items())
|
||||
# Invalidate cache
|
||||
PROVIDERS.resource_api.get_domain.invalidate(
|
||||
PROVIDERS.resource_api, domain_id
|
||||
)
|
||||
# Verify get_domain returns the updated domain
|
||||
self.assertDictContainsSubset(
|
||||
updated_domain_ref, PROVIDERS.resource_api.get_domain(domain_id))
|
||||
self.assertLessEqual(
|
||||
updated_domain_ref.items(),
|
||||
PROVIDERS.resource_api.get_domain(domain_id).items())
|
||||
# Update the domain back to original ref, using the assignment api
|
||||
# manager
|
||||
PROVIDERS.resource_api.update_domain(domain_id, domain_ref)
|
||||
self.assertDictContainsSubset(
|
||||
domain_ref, PROVIDERS.resource_api.get_domain(domain_id))
|
||||
self.assertLessEqual(
|
||||
domain_ref.items(),
|
||||
PROVIDERS.resource_api.get_domain(domain_id).items())
|
||||
# Make sure domain is 'disabled', bypass resource api manager
|
||||
project_domain_ref_disabled = project_domain_ref.copy()
|
||||
project_domain_ref_disabled['enabled'] = False
|
||||
@ -1407,8 +1410,9 @@ class ResourceTests(object):
|
||||
# Delete domain, bypassing resource api manager
|
||||
PROVIDERS.resource_api.driver.delete_project(domain_id)
|
||||
# Verify get_domain still returns the domain
|
||||
self.assertDictContainsSubset(
|
||||
domain_ref, PROVIDERS.resource_api.get_domain(domain_id))
|
||||
self.assertLessEqual(
|
||||
domain_ref.items(),
|
||||
PROVIDERS.resource_api.get_domain(domain_id).items())
|
||||
# Invalidate cache
|
||||
PROVIDERS.resource_api.get_domain.invalidate(
|
||||
PROVIDERS.resource_api, domain_id
|
||||
@ -1467,26 +1471,29 @@ class ResourceTests(object):
|
||||
project_id, updated_project
|
||||
)
|
||||
# Verify get_project still returns the original project_ref
|
||||
self.assertDictContainsSubset(
|
||||
project, PROVIDERS.resource_api.get_project(project_id))
|
||||
self.assertLessEqual(
|
||||
project.items(),
|
||||
PROVIDERS.resource_api.get_project(project_id).items())
|
||||
# Invalidate cache
|
||||
PROVIDERS.resource_api.get_project.invalidate(
|
||||
PROVIDERS.resource_api, project_id
|
||||
)
|
||||
# Verify get_project now returns the new project
|
||||
self.assertDictContainsSubset(
|
||||
updated_project,
|
||||
PROVIDERS.resource_api.get_project(project_id))
|
||||
self.assertLessEqual(
|
||||
updated_project.items(),
|
||||
PROVIDERS.resource_api.get_project(project_id).items())
|
||||
# Update project using the resource_api manager back to original
|
||||
PROVIDERS.resource_api.update_project(project['id'], project)
|
||||
# Verify get_project returns the original project_ref
|
||||
self.assertDictContainsSubset(
|
||||
project, PROVIDERS.resource_api.get_project(project_id))
|
||||
self.assertLessEqual(
|
||||
project.items(),
|
||||
PROVIDERS.resource_api.get_project(project_id).items())
|
||||
# Delete project bypassing resource
|
||||
PROVIDERS.resource_api.driver.delete_project(project_id)
|
||||
# Verify get_project still returns the project_ref
|
||||
self.assertDictContainsSubset(
|
||||
project, PROVIDERS.resource_api.get_project(project_id))
|
||||
self.assertLessEqual(
|
||||
project.items(),
|
||||
PROVIDERS.resource_api.get_project(project_id).items())
|
||||
# Invalidate cache
|
||||
PROVIDERS.resource_api.get_project.invalidate(
|
||||
PROVIDERS.resource_api, project_id
|
||||
|
@ -804,7 +804,7 @@ class BaseLDAPIdentity(LDAPTestSetup, IdentityTests, AssignmentTests,
|
||||
del user_dict['password']
|
||||
user_ref = PROVIDERS.identity_api.get_user(user['id'])
|
||||
user_ref_dict = {x: user_ref[x] for x in user_ref}
|
||||
self.assertDictContainsSubset(user_dict, user_ref_dict)
|
||||
self.assertLessEqual(user_dict.items(), user_ref_dict.items())
|
||||
|
||||
user_dict['password'] = uuid.uuid4().hex
|
||||
PROVIDERS.identity_api.update_user(user['id'], user_dict)
|
||||
@ -814,7 +814,7 @@ class BaseLDAPIdentity(LDAPTestSetup, IdentityTests, AssignmentTests,
|
||||
del user_dict['password']
|
||||
user_ref = PROVIDERS.identity_api.get_user(user['id'])
|
||||
user_ref_dict = {x: user_ref[x] for x in user_ref}
|
||||
self.assertDictContainsSubset(user_dict, user_ref_dict)
|
||||
self.assertLessEqual(user_dict.items(), user_ref_dict.items())
|
||||
|
||||
# The group and domain CRUD tests below override the standard ones in
|
||||
# unit.identity.test_backends.py so that we can exclude the update name
|
||||
@ -860,8 +860,9 @@ class BaseLDAPIdentity(LDAPTestSetup, IdentityTests, AssignmentTests,
|
||||
PROVIDERS.identity_api.get_group(group['id'])
|
||||
group['description'] = uuid.uuid4().hex
|
||||
group_ref = PROVIDERS.identity_api.update_group(group['id'], group)
|
||||
self.assertDictContainsSubset(
|
||||
PROVIDERS.identity_api.get_group(group['id']), group_ref
|
||||
self.assertLessEqual(
|
||||
PROVIDERS.identity_api.get_group(group['id']).items(),
|
||||
group_ref.items()
|
||||
)
|
||||
|
||||
@unit.skip_if_cache_disabled('identity')
|
||||
@ -878,14 +879,15 @@ class BaseLDAPIdentity(LDAPTestSetup, IdentityTests, AssignmentTests,
|
||||
PROVIDERS.identity_api.get_user(ref['id'])
|
||||
# update using identity api and get back updated user.
|
||||
user_updated = PROVIDERS.identity_api.update_user(ref['id'], user)
|
||||
self.assertDictContainsSubset(
|
||||
PROVIDERS.identity_api.get_user(ref['id']), user_updated
|
||||
self.assertLessEqual(
|
||||
PROVIDERS.identity_api.get_user(ref['id']).items(),
|
||||
user_updated.items()
|
||||
)
|
||||
self.assertDictContainsSubset(
|
||||
self.assertLessEqual(
|
||||
PROVIDERS.identity_api.get_user_by_name(
|
||||
ref['name'], ref['domain_id']
|
||||
),
|
||||
user_updated
|
||||
).items(),
|
||||
user_updated.items()
|
||||
)
|
||||
|
||||
@unit.skip_if_cache_disabled('identity')
|
||||
@ -899,14 +901,15 @@ class BaseLDAPIdentity(LDAPTestSetup, IdentityTests, AssignmentTests,
|
||||
)
|
||||
user['description'] = uuid.uuid4().hex
|
||||
user_updated = PROVIDERS.identity_api.update_user(ref['id'], user)
|
||||
self.assertDictContainsSubset(
|
||||
PROVIDERS.identity_api.get_user(ref['id']), user_updated
|
||||
self.assertLessEqual(
|
||||
PROVIDERS.identity_api.get_user(ref['id']).items(),
|
||||
user_updated.items()
|
||||
)
|
||||
self.assertDictContainsSubset(
|
||||
self.assertLessEqual(
|
||||
PROVIDERS.identity_api.get_user_by_name(
|
||||
ref['name'], ref['domain_id']
|
||||
),
|
||||
user_updated
|
||||
).items(),
|
||||
user_updated.items()
|
||||
)
|
||||
|
||||
def test_create_user_none_mapping(self):
|
||||
@ -1633,26 +1636,29 @@ class LDAPIdentity(BaseLDAPIdentity):
|
||||
project_id, updated_project
|
||||
)
|
||||
# Verify get_project still returns the original project_ref
|
||||
self.assertDictContainsSubset(
|
||||
project, PROVIDERS.resource_api.get_project(project_id))
|
||||
self.assertLessEqual(
|
||||
project.items(),
|
||||
PROVIDERS.resource_api.get_project(project_id).items())
|
||||
# Invalidate cache
|
||||
PROVIDERS.resource_api.get_project.invalidate(
|
||||
PROVIDERS.resource_api, project_id
|
||||
)
|
||||
# Verify get_project now returns the new project
|
||||
self.assertDictContainsSubset(
|
||||
updated_project,
|
||||
PROVIDERS.resource_api.get_project(project_id))
|
||||
self.assertLessEqual(
|
||||
updated_project.items(),
|
||||
PROVIDERS.resource_api.get_project(project_id).items())
|
||||
# Update project using the resource_api manager back to original
|
||||
PROVIDERS.resource_api.update_project(project['id'], project)
|
||||
# Verify get_project returns the original project_ref
|
||||
self.assertDictContainsSubset(
|
||||
project, PROVIDERS.resource_api.get_project(project_id))
|
||||
self.assertLessEqual(
|
||||
project.items(),
|
||||
PROVIDERS.resource_api.get_project(project_id).items())
|
||||
# Delete project bypassing resource_api
|
||||
PROVIDERS.resource_api.driver.delete_project(project_id)
|
||||
# Verify get_project still returns the project_ref
|
||||
self.assertDictContainsSubset(
|
||||
project, PROVIDERS.resource_api.get_project(project_id))
|
||||
self.assertLessEqual(
|
||||
project.items(),
|
||||
PROVIDERS.resource_api.get_project(project_id).items())
|
||||
# Invalidate cache
|
||||
PROVIDERS.resource_api.get_project.invalidate(
|
||||
PROVIDERS.resource_api, project_id
|
||||
|
@ -1101,7 +1101,7 @@ class RestfulTestCase(unit.SQLDriverOverrides, rest.RestfulTestCase,
|
||||
if ref:
|
||||
links = ref.pop('links')
|
||||
try:
|
||||
self.assertDictContainsSubset(ref, entity)
|
||||
self.assertLessEqual(ref.items(), entity.items())
|
||||
self.assertIn(links['assignment'],
|
||||
entity['links']['assignment'])
|
||||
finally:
|
||||
|
Loading…
Reference in New Issue
Block a user