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