diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_token_provider.py | 14 | ||||
| -rw-r--r-- | tests/test_v3_identity.py | 28 |
2 files changed, 24 insertions, 18 deletions
diff --git a/tests/test_token_provider.py b/tests/test_token_provider.py index 31205073..1bcf1a21 100644 --- a/tests/test_token_provider.py +++ b/tests/test_token_provider.py @@ -397,39 +397,39 @@ class TestTokenProvider(test.TestCase): token.provider.Manager() def test_default_token_format(self): - self.assertEqual(token.provider.Manager.check_and_get_token_provider(), + self.assertEqual(token.provider.Manager.get_token_provider(), token.provider.PKI_PROVIDER) def test_uuid_token_format_and_no_provider(self): self.opt_in_group('signing', token_format='UUID') - self.assertEqual(token.provider.Manager.check_and_get_token_provider(), + self.assertEqual(token.provider.Manager.get_token_provider(), token.provider.UUID_PROVIDER) def test_unsupported_token_format(self): self.opt_in_group('signing', token_format='CUSTOM') self.assertRaises(exception.UnexpectedError, - token.provider.Manager.check_and_get_token_provider) + token.provider.Manager.get_token_provider) def test_provider_override_token_format(self): self.opt_in_group('token', provider='keystone.token.providers.pki.Test') self.assertRaises(exception.UnexpectedError, - token.provider.Manager.check_and_get_token_provider) + token.provider.Manager.get_token_provider) self.opt_in_group('signing', token_format='UUID') self.opt_in_group('token', provider=token.provider.UUID_PROVIDER) - self.assertEqual(token.provider.Manager.check_and_get_token_provider(), + self.assertEqual(token.provider.Manager.get_token_provider(), token.provider.UUID_PROVIDER) self.opt_in_group('signing', token_format='PKI') self.opt_in_group('token', provider=token.provider.PKI_PROVIDER) - self.assertEqual(token.provider.Manager.check_and_get_token_provider(), + self.assertEqual(token.provider.Manager.get_token_provider(), token.provider.PKI_PROVIDER) self.opt_in_group('signing', token_format='CUSTOM') self.opt_in_group('token', provider='my.package.MyProvider') - self.assertEqual(token.provider.Manager.check_and_get_token_provider(), + self.assertEqual(token.provider.Manager.get_token_provider(), 'my.package.MyProvider') diff --git a/tests/test_v3_identity.py b/tests/test_v3_identity.py index 3efc3b35..5eaf9085 100644 --- a/tests/test_v3_identity.py +++ b/tests/test_v3_identity.py @@ -827,14 +827,17 @@ class IdentityTestCase(test_v3.RestfulTestCase): self.assertValidRoleAssignmentListResponse(r) self.assertEqual(len(r.result.get('role_assignments')), existing_assignments + 2) - ud_url, ud_entity = _build_role_assignment_url_and_entity( + unused, ud_entity = _build_role_assignment_url_and_entity( domain_id=self.domain_id, user_id=self.user1['id'], role_id=self.role_id) - self.assertRoleAssignmentInListResponse(r, ud_entity, link_url=ud_url) + gd_url, unused = _build_role_assignment_url_and_entity( + domain_id=self.domain_id, group_id=self.group['id'], + role_id=self.role_id) + self.assertRoleAssignmentInListResponse(r, ud_entity, link_url=gd_url) ud_url, ud_entity = _build_role_assignment_url_and_entity( domain_id=self.domain_id, user_id=self.user2['id'], role_id=self.role_id) - self.assertRoleAssignmentInListResponse(r, ud_entity, link_url=ud_url) + self.assertRoleAssignmentInListResponse(r, ud_entity, link_url=gd_url) def test_check_effective_values_for_role_assignments(self): """Call ``GET /role_assignments?effective=value``. @@ -1049,16 +1052,22 @@ class IdentityTestCase(test_v3.RestfulTestCase): self.assertRoleAssignmentInListResponse(r, up_entity, link_url=up_url) self.assertRoleAssignmentInListResponse(r, ud_entity, link_url=ud_url) # ...and the two via group membership... - up1_url, up1_entity = _build_role_assignment_url_and_entity( + unused, up1_entity = _build_role_assignment_url_and_entity( project_id=self.project1['id'], user_id=self.user1['id'], role_id=self.role1['id']) - ud1_url, ud1_entity = _build_role_assignment_url_and_entity( + unused, ud1_entity = _build_role_assignment_url_and_entity( domain_id=self.domain_id, user_id=self.user1['id'], role_id=self.role1['id']) + gp1_url, unused = _build_role_assignment_url_and_entity( + project_id=self.project1['id'], group_id=self.group1['id'], + role_id=self.role1['id']) + gd1_url, unused = _build_role_assignment_url_and_entity( + domain_id=self.domain_id, group_id=self.group1['id'], + role_id=self.role1['id']) self.assertRoleAssignmentInListResponse(r, up1_entity, - link_url=up1_url) + link_url=gp1_url) self.assertRoleAssignmentInListResponse(r, ud1_entity, - link_url=ud1_url) + link_url=gd1_url) # ...and for the grand-daddy of them all, simulate the request # that would generate the list of effective roles in a project @@ -1073,12 +1082,9 @@ class IdentityTestCase(test_v3.RestfulTestCase): self.assertValidRoleAssignmentListResponse(r) self.assertEqual(len(r.result.get('role_assignments')), 2) # Should have one direct role and one from group membership... - up1_url, up1_entity = _build_role_assignment_url_and_entity( - project_id=self.project1['id'], user_id=self.user1['id'], - role_id=self.role1['id']) self.assertRoleAssignmentInListResponse(r, up_entity, link_url=up_url) self.assertRoleAssignmentInListResponse(r, up1_entity, - link_url=up1_url) + link_url=gp1_url) class IdentityIneritanceTestCase(test_v3.RestfulTestCase): |