openstack/tempest
Code Issues Proposed changes

Merge "Replace deprecated assertDictContainsSubset"

Browse Source
This commit is contained in:
Zuul 2021-12-01 15:32:23 +00:00 committed by Gerrit Code Review
commit 94e2f8fdf2
4 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tempest/api/identity/admin/v3/test_domains.py
View File

@ -157,4 +157,4 @@ class DomainsTestJSON(base.BaseIdentityV3AdminTest):
self.addCleanup(self.delete_domain, domain['id'])
expected_data = {'name': d_name, 'enabled': True}
self.assertEqual('', domain['description'])
self.assertDictContainsSubset(expected_data, domain)
self.assertLessEqual(expected_data.items(), domain.items())

6
tempest/api/identity/admin/v3/test_services.py
View File

@ -44,7 +44,7 @@ class ServicesTestJSON(base.BaseIdentityV3AdminTest):
# Verifying response body of create service
expected_data = {'name': name, 'type': serv_type, 'description': desc}
self.assertDictContainsSubset(expected_data, create_service)
self.assertLessEqual(expected_data.items(), create_service.items())
# Update description
s_id = create_service['id']
@ -61,7 +61,7 @@ class ServicesTestJSON(base.BaseIdentityV3AdminTest):
resp3_desc = fetched_service['description']
self.assertEqual(resp2_desc, resp3_desc)
self.assertDictContainsSubset(update_service, fetched_service)
self.assertLessEqual(update_service.items(), fetched_service.items())
@decorators.idempotent_id('d1dcb1a1-2b6b-4da8-bbb8-5532ef6e8269')
def test_create_service_without_description(self):
@ -72,7 +72,7 @@ class ServicesTestJSON(base.BaseIdentityV3AdminTest):
type=serv_type, name=name)['service']
self.addCleanup(self.services_client.delete_service, service['id'])
expected_data = {'name': name, 'type': serv_type}
self.assertDictContainsSubset(expected_data, service)
self.assertLessEqual(expected_data.items(), service.items())
@decorators.idempotent_id('e55908e8-360e-439e-8719-c3230a3e179e')
def test_list_services(self):

2
tempest/api/volume/admin/test_volume_quotas.py
View File

@ -87,7 +87,7 @@ class VolumeQuotasAdminTestJSON(base.BaseVolumeAdminTest):
# test that the specific values we set are actually in
# the final result. There is nothing here that ensures there
# would be no other values in there.
self.assertDictContainsSubset(new_quota_set, quota_set)
self.assertLessEqual(new_quota_set.items(), quota_set.items())
@decorators.idempotent_id('18c51ae9-cb03-48fc-b234-14a19374dbed')
def test_show_quota_usage(self):

42
tempest/tests/lib/common/test_rest_client.py
View File

@ -144,11 +144,11 @@ class TestRestClientUpdateHeaders(BaseRestClientTestClass):
extra_headers=True,
headers=self.headers)
self.assertDictContainsSubset(
self.assertLessEqual(
{'X-Configuration-Session': 'session_id',
'Content-Type': 'application/json',
'Accept': 'application/json'},
return_dict['headers']
'Accept': 'application/json'}.items(),
return_dict['headers'].items()
)
def test_get_update_headers(self):
@ -156,11 +156,11 @@ class TestRestClientUpdateHeaders(BaseRestClientTestClass):
extra_headers=True,
headers=self.headers)
self.assertDictContainsSubset(
self.assertLessEqual(
{'X-Configuration-Session': 'session_id',
'Content-Type': 'application/json',
'Accept': 'application/json'},
return_dict['headers']
'Accept': 'application/json'}.items(),
return_dict['headers'].items()
)
def test_delete_update_headers(self):
@ -168,11 +168,11 @@ class TestRestClientUpdateHeaders(BaseRestClientTestClass):
extra_headers=True,
headers=self.headers)
self.assertDictContainsSubset(
self.assertLessEqual(
{'X-Configuration-Session': 'session_id',
'Content-Type': 'application/json',
'Accept': 'application/json'},
return_dict['headers']
'Accept': 'application/json'}.items(),
return_dict['headers'].items()
)
def test_patch_update_headers(self):
@ -180,11 +180,11 @@ class TestRestClientUpdateHeaders(BaseRestClientTestClass):
extra_headers=True,
headers=self.headers)
self.assertDictContainsSubset(
self.assertLessEqual(
{'X-Configuration-Session': 'session_id',
'Content-Type': 'application/json',
'Accept': 'application/json'},
return_dict['headers']
'Accept': 'application/json'}.items(),
return_dict['headers'].items()
)
def test_put_update_headers(self):
@ -192,11 +192,11 @@ class TestRestClientUpdateHeaders(BaseRestClientTestClass):
extra_headers=True,
headers=self.headers)
self.assertDictContainsSubset(
self.assertLessEqual(
{'X-Configuration-Session': 'session_id',
'Content-Type': 'application/json',
'Accept': 'application/json'},
return_dict['headers']
'Accept': 'application/json'}.items(),
return_dict['headers'].items()
)
def test_head_update_headers(self):
@ -207,11 +207,11 @@ class TestRestClientUpdateHeaders(BaseRestClientTestClass):
extra_headers=True,
headers=self.headers)
self.assertDictContainsSubset(
self.assertLessEqual(
{'X-Configuration-Session': 'session_id',
'Content-Type': 'application/json',
'Accept': 'application/json'},
return_dict['headers']
'Accept': 'application/json'}.items(),
return_dict['headers'].items()
)
def test_copy_update_headers(self):
@ -219,11 +219,11 @@ class TestRestClientUpdateHeaders(BaseRestClientTestClass):
extra_headers=True,
headers=self.headers)
self.assertDictContainsSubset(
self.assertLessEqual(
{'X-Configuration-Session': 'session_id',
'Content-Type': 'application/json',
'Accept': 'application/json'},
return_dict['headers']
'Accept': 'application/json'}.items(),
return_dict['headers'].items()
)