Modify roles tests to deal with a default role.
Change-Id: I82535f0fe7df9a50c06e4eb468a3258cc4270c5f
diff --git a/tempest/tests/identity/admin/test_roles.py b/tempest/tests/identity/admin/test_roles.py
index 3194e7d..46db4fb 100644
--- a/tempest/tests/identity/admin/test_roles.py
+++ b/tempest/tests/identity/admin/test_roles.py
@@ -118,13 +118,19 @@
class UserRolesTestBase(RolesTestBase):
+ def assert_role_in_role_list(self, role, roles):
+ found = False
+ for user_role in roles:
+ if user_role['id'] == role['id']:
+ found = True
+ self.assertTrue(found, "assigned role was not in list")
+
def test_assign_user_role(self):
# Assign a role to a user on a tenant
(user, tenant, role) = self._get_role_params()
self.client.assign_user_role(tenant['id'], user['id'], role['id'])
resp, roles = self.client.list_user_roles(tenant['id'], user['id'])
- self.assertEquals(1, len(roles))
- self.assertEquals(roles[0]['id'], role['id'])
+ self.assert_role_in_role_list(role, roles)
def test_assign_user_role_by_unauthorized_user(self):
# Non admin user should not be authorized to assign a role to user
@@ -232,8 +238,7 @@
(user, tenant, role) = self._get_role_params()
self.client.assign_user_role(tenant['id'], user['id'], role['id'])
resp, roles = self.client.list_user_roles(tenant['id'], user['id'])
- self.assertEquals(1, len(roles))
- self.assertEquals(role['id'], roles[0]['id'])
+ self.assert_role_in_role_list(role, roles)
def test_list_user_roles_by_unauthorized_user(self):
# Non admin user should not be authorized to list a user's roles