openstack
/
keystone-tempest-plugin
Code Issues Proposed changes

Replace assertItemsEqual with assertCountEqual 

assertItemsEqual was removed from Python's unittest.TestCase in
Python 3.3 [1][2]. We have been able to use them since then, because
testtools required unittest2, which still included it. With testtools
removing Python 2.7 support [3][4], we will lose support for
assertItemsEqual, so we should switch to use assertCountEqual.

[1] - https://bugs.python.org/issue17866
[2] - https://hg.python.org/cpython/rev/d9921cb6e3cd
[3] - testing-cabal/testtools#286
[4] - testing-cabal/testtools#277

Change-Id: I2edc09748de1739c558040a8ae6a15373ad1a93b
This commit is contained in:
gugug 2020-07-12 11:25:13 +08:00
parent aa17472706
commit c2abd827db
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
keystone_tempest_plugin/tests/api/identity/v3/test_identity_providers.py
View File

@ -38,7 +38,7 @@ class IndentityProvidersTest(base.BaseIdentityTest):
self.assertEqual(idp_ref['enabled'], idp['enabled'])
if 'remote_ids' in idp_ref:
self.assertItemsEqual(idp_ref['remote_ids'], idp['remote_ids'])
self.assertCountEqual(idp_ref['remote_ids'], idp['remote_ids'])
def _create_idp(self, idp_id, idp_ref):
idp = self.idps_client.create_identity_provider(

2
keystone_tempest_plugin/tests/api/identity/v3/test_mapping_rules.py
View File

@ -32,7 +32,7 @@ class MappingRulesTest(base.BaseIdentityTest):
self.assertIn('rules', mapping)
if mapping_ref:
self.assertItemsEqual(mapping_ref['rules'], mapping['rules'])
self.assertCountEqual(mapping_ref['rules'], mapping['rules'])
def _create_mapping_rule(self, mapping_id, mapping_ref):
mapping = self.mappings_client.create_mapping_rule(

2
keystone_tempest_plugin/tests/api/identity/v3/test_oauth1_tokens.py
View File

@ -219,7 +219,7 @@ class OAUTH1TokensTest(base.BaseIdentityTest):
role_ids = [role['id'] for role in roles['roles']]
# check that role ids matches
self.assertItemsEqual(fetched_role_ids, role_ids)
self.assertCountEqual(fetched_role_ids, role_ids)
@decorators.idempotent_id('28aee994-86b1-4596-a652-572f558045e7')
def test_show_role_for_access_token(self):