diff options
| author | Zuul <zuul@review.opendev.org> | 2020-09-09 03:33:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-09-09 03:33:05 +0000 |
| commit | d5cb761763988217cdd00a7981a62e2083fd381f (patch) | |
| tree | dbc48185901a9ea1861ea2d3d53790a9fee7a58e | |
| parent | eecac33faa4ff36accc31d4f4b4421fe2d66b71e (diff) | |
| parent | f88a23acb1cbe3f1b6c672f714edb0ab5f83960b (diff) | |
| download | python-keystoneclient-d5cb761763988217cdd00a7981a62e2083fd381f.tar.gz | |
Merge "Replace assertItemsEqual with assertCountEqual"xena-emwallaby-em4.3.04.2.0
| -rw-r--r-- | keystoneclient/tests/functional/v3/test_projects.py | 8 | ||||
| -rw-r--r-- | keystoneclient/tests/functional/v3/test_roles.py | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/keystoneclient/tests/functional/v3/test_projects.py b/keystoneclient/tests/functional/v3/test_projects.py index eec2745..a7f082d 100644 --- a/keystoneclient/tests/functional/v3/test_projects.py +++ b/keystoneclient/tests/functional/v3/test_projects.py @@ -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) diff --git a/keystoneclient/tests/functional/v3/test_roles.py b/keystoneclient/tests/functional/v3/test_roles.py index d2bc7a2..6dba6ff 100644 --- a/keystoneclient/tests/functional/v3/test_roles.py +++ b/keystoneclient/tests/functional/v3/test_roles.py @@ -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, |