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: Ib5985049235ee1b6018fc172a67e3b05970a6c42
This commit is contained in:
parent
81229eb2c1
commit
f88a23acb1
|
@ -118,10 +118,10 @@ class ProjectsTestCase(base.V3ClientTestCase, ProjectsTestMixin):
|
|||
parents_as_list=True)
|
||||
|
||||
self.check_project(project_ret, project.ref)
|
||||
self.assertItemsEqual(
|
||||
self.assertCountEqual(
|
||||
[{'project': self.test_project.entity.to_dict()}],
|
||||
project_ret.parents)
|
||||
self.assertItemsEqual(
|
||||
self.assertCountEqual(
|
||||
[{'project': child_project.entity.to_dict()}],
|
||||
project_ret.subtree)
|
||||
|
||||
|
@ -138,8 +138,8 @@ class ProjectsTestCase(base.V3ClientTestCase, ProjectsTestMixin):
|
|||
subtree_as_ids=True,
|
||||
parents_as_ids=True)
|
||||
|
||||
self.assertItemsEqual([self.test_project.id], project_ret.parents)
|
||||
self.assertItemsEqual([child_project.id], project_ret.subtree)
|
||||
self.assertCountEqual([self.test_project.id], project_ret.parents)
|
||||
self.assertCountEqual([child_project.id], project_ret.subtree)
|
||||
|
||||
def test_list_projects(self):
|
||||
project_one = fixtures.Project(self.client, self.test_domain.id)
|
||||
|
|
|
@ -168,7 +168,7 @@ class RolesTestCase(base.V3ClientTestCase):
|
|||
self.client.roles.grant(role, user=user.id, domain=domain.id)
|
||||
roles_after_grant = self.client.roles.list(user=user.id,
|
||||
domain=domain.id)
|
||||
self.assertItemsEqual(roles_after_grant, [role.entity])
|
||||
self.assertCountEqual(roles_after_grant, [role.entity])
|
||||
|
||||
self.client.roles.revoke(role, user=user.id, domain=domain.id)
|
||||
roles_after_revoke = self.client.roles.list(user=user.id,
|
||||
|
@ -188,7 +188,7 @@ class RolesTestCase(base.V3ClientTestCase):
|
|||
self.client.roles.grant(role, user=user.id, project=project.id)
|
||||
roles_after_grant = self.client.roles.list(user=user.id,
|
||||
project=project.id)
|
||||
self.assertItemsEqual(roles_after_grant, [role.entity])
|
||||
self.assertCountEqual(roles_after_grant, [role.entity])
|
||||
|
||||
self.client.roles.revoke(role, user=user.id, project=project.id)
|
||||
roles_after_revoke = self.client.roles.list(user=user.id,
|
||||
|
@ -208,7 +208,7 @@ class RolesTestCase(base.V3ClientTestCase):
|
|||
self.client.roles.grant(role, group=group.id, domain=domain.id)
|
||||
roles_after_grant = self.client.roles.list(group=group.id,
|
||||
domain=domain.id)
|
||||
self.assertItemsEqual(roles_after_grant, [role.entity])
|
||||
self.assertCountEqual(roles_after_grant, [role.entity])
|
||||
|
||||
self.client.roles.revoke(role, group=group.id, domain=domain.id)
|
||||
roles_after_revoke = self.client.roles.list(group=group.id,
|
||||
|
@ -228,7 +228,7 @@ class RolesTestCase(base.V3ClientTestCase):
|
|||
self.client.roles.grant(role, group=group.id, project=project.id)
|
||||
roles_after_grant = self.client.roles.list(group=group.id,
|
||||
project=project.id)
|
||||
self.assertItemsEqual(roles_after_grant, [role.entity])
|
||||
self.assertCountEqual(roles_after_grant, [role.entity])
|
||||
|
||||
self.client.roles.revoke(role, group=group.id, project=project.id)
|
||||
roles_after_revoke = self.client.roles.list(group=group.id,
|
||||
|
|
Loading…
Reference in New Issue