diff options
Diffstat (limited to 'tests/test_backend_ldap.py')
| -rw-r--r-- | tests/test_backend_ldap.py | 68 |
1 files changed, 33 insertions, 35 deletions
diff --git a/tests/test_backend_ldap.py b/tests/test_backend_ldap.py index ce4a297c..6805794e 100644 --- a/tests/test_backend_ldap.py +++ b/tests/test_backend_ldap.py @@ -17,8 +17,6 @@ import uuid -import nose.exc - from keystone import assignment from keystone.common.ldap import fakeldap from keystone.common import sql @@ -109,93 +107,93 @@ class BaseLDAPIdentity(test_backend.IdentityTests): self.user_foo['id']) def test_get_role_grant_by_user_and_project(self): - raise nose.exc.SkipTest('Blocked by bug 1101287') + self.skipTest('Blocked by bug 1101287') def test_get_role_grants_for_user_and_project_404(self): - raise nose.exc.SkipTest('Blocked by bug 1101287') + self.skipTest('Blocked by bug 1101287') def test_add_role_grant_to_user_and_project_404(self): - raise nose.exc.SkipTest('Blocked by bug 1101287') + self.skipTest('Blocked by bug 1101287') def test_remove_role_grant_from_user_and_project(self): - raise nose.exc.SkipTest('Blocked by bug 1101287') + self.skipTest('Blocked by bug 1101287') def test_get_and_remove_role_grant_by_group_and_project(self): - raise nose.exc.SkipTest('Blocked by bug 1101287') + self.skipTest('Blocked by bug 1101287') def test_get_and_remove_role_grant_by_group_and_domain(self): - raise nose.exc.SkipTest('N/A: LDAP does not support multiple domains') + self.skipTest('N/A: LDAP does not support multiple domains') def test_get_and_remove_role_grant_by_user_and_domain(self): - raise nose.exc.SkipTest('N/A: LDAP does not support multiple domains') + self.skipTest('N/A: LDAP does not support multiple domains') def test_get_and_remove_correct_role_grant_from_a_mix(self): - raise nose.exc.SkipTest('Blocked by bug 1101287') + self.skipTest('Blocked by bug 1101287') def test_get_and_remove_role_grant_by_group_and_cross_domain(self): - raise nose.exc.SkipTest('N/A: LDAP does not support multiple domains') + self.skipTest('N/A: LDAP does not support multiple domains') def test_get_and_remove_role_grant_by_user_and_cross_domain(self): - raise nose.exc.SkipTest('N/A: LDAP does not support multiple domains') + self.skipTest('N/A: LDAP does not support multiple domains') def test_role_grant_by_group_and_cross_domain_project(self): - raise nose.exc.SkipTest('N/A: LDAP does not support multiple domains') + self.skipTest('N/A: LDAP does not support multiple domains') def test_role_grant_by_user_and_cross_domain_project(self): - raise nose.exc.SkipTest('N/A: LDAP does not support multiple domains') + self.skipTest('N/A: LDAP does not support multiple domains') def test_multi_role_grant_by_user_group_on_project_domain(self): - raise nose.exc.SkipTest('N/A: LDAP does not support multiple domains') + self.skipTest('N/A: LDAP does not support multiple domains') def test_delete_role_with_user_and_group_grants(self): - raise nose.exc.SkipTest('Blocked by bug 1101287') + self.skipTest('Blocked by bug 1101287') def test_delete_user_with_group_project_domain_links(self): - raise nose.exc.SkipTest('N/A: LDAP does not support multiple domains') + self.skipTest('N/A: LDAP does not support multiple domains') def test_delete_group_with_user_project_domain_links(self): - raise nose.exc.SkipTest('N/A: LDAP does not support multiple domains') + self.skipTest('N/A: LDAP does not support multiple domains') def test_list_user_projects(self): - raise nose.exc.SkipTest('Blocked by bug 1101287') + self.skipTest('Blocked by bug 1101287') def test_create_duplicate_user_name_in_different_domains(self): - raise nose.exc.SkipTest('Blocked by bug 1101276') + self.skipTest('Blocked by bug 1101276') def test_create_duplicate_project_name_in_different_domains(self): - raise nose.exc.SkipTest('Blocked by bug 1101276') + self.skipTest('Blocked by bug 1101276') def test_create_duplicate_group_name_in_different_domains(self): - raise nose.exc.SkipTest( + self.skipTest( 'N/A: LDAP does not support multiple domains') def test_move_user_between_domains(self): - raise nose.exc.SkipTest('Blocked by bug 1101276') + self.skipTest('Blocked by bug 1101276') def test_move_user_between_domains_with_clashing_names_fails(self): - raise nose.exc.SkipTest('Blocked by bug 1101276') + self.skipTest('Blocked by bug 1101276') def test_move_group_between_domains(self): - raise nose.exc.SkipTest( + self.skipTest( 'N/A: LDAP does not support multiple domains') def test_move_group_between_domains_with_clashing_names_fails(self): - raise nose.exc.SkipTest('Blocked by bug 1101276') + self.skipTest('Blocked by bug 1101276') def test_move_project_between_domains(self): - raise nose.exc.SkipTest('Blocked by bug 1101276') + self.skipTest('Blocked by bug 1101276') def test_move_project_between_domains_with_clashing_names_fails(self): - raise nose.exc.SkipTest('Blocked by bug 1101276') + self.skipTest('Blocked by bug 1101276') def test_get_roles_for_user_and_domain(self): - raise nose.exc.SkipTest('N/A: LDAP does not support multiple domains') + self.skipTest('N/A: LDAP does not support multiple domains') def test_list_role_assignments_unfiltered(self): - raise nose.exc.SkipTest('Blocked by bug 1195019') + self.skipTest('Blocked by bug 1195019') def test_multi_group_grants_on_project_domain(self): - raise nose.exc.SkipTest('Blocked by bug 1101287') + self.skipTest('Blocked by bug 1101287') def test_list_group_members_missing_entry(self): """List group members with deleted user. @@ -631,7 +629,7 @@ class LDAPIdentity(test.TestCase, BaseLDAPIdentity): self.assertEquals(len(combined_role_list), 0) def test_list_projects_for_alternate_domain(self): - raise nose.exc.SkipTest( + self.skipTest( 'N/A: LDAP does not support multiple domains') @@ -705,7 +703,7 @@ class LDAPIdentityEnabledEmulation(LDAPIdentity): user['id']) def test_user_enable_attribute_mask(self): - raise nose.exc.SkipTest( + self.skipTest( "Enabled emulation conflicts with enabled mask") @@ -739,9 +737,9 @@ class LdapIdentitySqlAssignment(sql.Base, test.TestCase, BaseLDAPIdentity): self.assertEquals(domains, [assignment.DEFAULT_DOMAIN]) def test_project_filter(self): - raise nose.exc.SkipTest( + self.skipTest( 'N/A: Not part of SQL backend') def test_role_filter(self): - raise nose.exc.SkipTest( + self.skipTest( 'N/A: Not part of SQL backend') |