openstack/keystone
Code Issues Proposed changes

Merge "remove unneeded config reloading (it's already done during setUp)"

Browse Source
This commit is contained in:
Jenkins 2013-02-16 15:58:42 +00:00 committed by Gerrit Code Review
commit 65b14f003e
1 changed files with 0 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
tests/test_backend_ldap.py
View File

@ -48,18 +48,11 @@ class LDAPIdentity(test.TestCase, test_backend.IdentityTests):
def test_build_tree(self): def test_build_tree(self):
"""Regression test for building the tree names """Regression test for building the tree names
""" """
self.config([test.etcdir('keystone.conf.sample'),
test.testsdir('test_overrides.conf'),
test.testsdir('backend_ldap.conf')])
user_api = identity_ldap.UserApi(CONF) user_api = identity_ldap.UserApi(CONF)
self.assertTrue(user_api) self.assertTrue(user_api)
self.assertEquals(user_api.tree_dn, "ou=Users,%s" % CONF.ldap.suffix) self.assertEquals(user_api.tree_dn, "ou=Users,%s" % CONF.ldap.suffix)
def test_configurable_allowed_user_actions(self): def test_configurable_allowed_user_actions(self):
self.config([test.etcdir('keystone.conf.sample'),
test.testsdir('test_overrides.conf'),
test.testsdir('backend_ldap.conf')])
self.identity_api = identity_ldap.Identity() self.identity_api = identity_ldap.Identity()
user = {'id': 'fake1', user = {'id': 'fake1',
@ -79,9 +72,6 @@ class LDAPIdentity(test.TestCase, test_backend.IdentityTests):
'fake1') 'fake1')
def test_configurable_forbidden_user_actions(self): def test_configurable_forbidden_user_actions(self):
self.config([test.etcdir('keystone.conf.sample'),
test.testsdir('test_overrides.conf'),
test.testsdir('backend_ldap.conf')])
CONF.ldap.user_allow_create = False CONF.ldap.user_allow_create = False
CONF.ldap.user_allow_update = False CONF.ldap.user_allow_update = False
CONF.ldap.user_allow_delete = False CONF.ldap.user_allow_delete = False
@ -107,9 +97,6 @@ class LDAPIdentity(test.TestCase, test_backend.IdentityTests):
self.user_foo['id']) self.user_foo['id'])
def test_configurable_allowed_project_actions(self): def test_configurable_allowed_project_actions(self):
self.config([test.etcdir('keystone.conf.sample'),
test.testsdir('test_overrides.conf'),
test.testsdir('backend_ldap.conf')])
self.identity_api = identity_ldap.Identity() self.identity_api = identity_ldap.Identity()
tenant = {'id': 'fake1', 'name': 'fake1', 'enabled': True} tenant = {'id': 'fake1', 'name': 'fake1', 'enabled': True}
@ -126,9 +113,6 @@ class LDAPIdentity(test.TestCase, test_backend.IdentityTests):
'fake1') 'fake1')
def test_configurable_forbidden_project_actions(self): def test_configurable_forbidden_project_actions(self):
self.config([test.etcdir('keystone.conf.sample'),
test.testsdir('test_overrides.conf'),
test.testsdir('backend_ldap.conf')])
CONF.ldap.tenant_allow_create = False CONF.ldap.tenant_allow_create = False
CONF.ldap.tenant_allow_update = False CONF.ldap.tenant_allow_update = False
CONF.ldap.tenant_allow_delete = False CONF.ldap.tenant_allow_delete = False
@ -150,9 +134,6 @@ class LDAPIdentity(test.TestCase, test_backend.IdentityTests):
self.tenant_bar['id']) self.tenant_bar['id'])
def test_configurable_allowed_role_actions(self): def test_configurable_allowed_role_actions(self):
self.config([test.etcdir('keystone.conf.sample'),
test.testsdir('test_overrides.conf'),
test.testsdir('backend_ldap.conf')])
self.identity_api = identity_ldap.Identity() self.identity_api = identity_ldap.Identity()
role = {'id': 'fake1', 'name': 'fake1'} role = {'id': 'fake1', 'name': 'fake1'}
@ -169,9 +150,6 @@ class LDAPIdentity(test.TestCase, test_backend.IdentityTests):
'fake1') 'fake1')
def test_configurable_forbidden_role_actions(self): def test_configurable_forbidden_role_actions(self):
self.config([test.etcdir('keystone.conf.sample'),
test.testsdir('test_overrides.conf'),
test.testsdir('backend_ldap.conf')])
CONF.ldap.role_allow_create = False CONF.ldap.role_allow_create = False
CONF.ldap.role_allow_update = False CONF.ldap.role_allow_update = False
CONF.ldap.role_allow_delete = False CONF.ldap.role_allow_delete = False
@ -194,9 +172,6 @@ class LDAPIdentity(test.TestCase, test_backend.IdentityTests):
self.role_member['id']) self.role_member['id'])
def test_user_filter(self): def test_user_filter(self):
self.config([test.etcdir('keystone.conf.sample'),
test.testsdir('test_overrides.conf'),
test.testsdir('backend_ldap.conf')])
user_ref = self.identity_api.get_user(self.user_foo['id']) user_ref = self.identity_api.get_user(self.user_foo['id'])
self.user_foo.pop('password') self.user_foo.pop('password')
self.assertDictEqual(user_ref, self.user_foo) self.assertDictEqual(user_ref, self.user_foo)
@ -208,9 +183,6 @@ class LDAPIdentity(test.TestCase, test_backend.IdentityTests):
self.user_foo['id']) self.user_foo['id'])
def test_project_filter(self): def test_project_filter(self):
self.config([test.etcdir('keystone.conf.sample'),
test.testsdir('test_overrides.conf'),
test.testsdir('backend_ldap.conf')])
tenant_ref = self.identity_api.get_project(self.tenant_bar['id']) tenant_ref = self.identity_api.get_project(self.tenant_bar['id'])
self.assertDictEqual(tenant_ref, self.tenant_bar) self.assertDictEqual(tenant_ref, self.tenant_bar)
@ -221,9 +193,6 @@ class LDAPIdentity(test.TestCase, test_backend.IdentityTests):
self.tenant_bar['id']) self.tenant_bar['id'])
def test_role_filter(self): def test_role_filter(self):
self.config([test.etcdir('keystone.conf.sample'),
test.testsdir('test_overrides.conf'),
test.testsdir('backend_ldap.conf')])
role_ref = self.identity_api.get_role(self.role_member['id']) role_ref = self.identity_api.get_role(self.role_member['id'])
self.assertDictEqual(role_ref, self.role_member) self.assertDictEqual(role_ref, self.role_member)
@ -234,9 +203,6 @@ class LDAPIdentity(test.TestCase, test_backend.IdentityTests):
self.role_member['id']) self.role_member['id'])
def test_dumb_member(self): def test_dumb_member(self):
self.config([test.etcdir('keystone.conf.sample'),
test.testsdir('test_overrides.conf'),
test.testsdir('backend_ldap.conf')])
CONF.ldap.use_dumb_member = True CONF.ldap.use_dumb_member = True
CONF.ldap.dumb_member = 'cn=dumb,cn=example,cn=com' CONF.ldap.dumb_member = 'cn=dumb,cn=example,cn=com'
clear_database() clear_database()
@ -247,9 +213,6 @@ class LDAPIdentity(test.TestCase, test_backend.IdentityTests):
'dumb') 'dumb')
def test_user_attribute_mapping(self): def test_user_attribute_mapping(self):
self.config([test.etcdir('keystone.conf.sample'),
test.testsdir('test_overrides.conf'),
test.testsdir('backend_ldap.conf')])
CONF.ldap.user_name_attribute = 'sn' CONF.ldap.user_name_attribute = 'sn'
CONF.ldap.user_mail_attribute = 'email' CONF.ldap.user_mail_attribute = 'email'
CONF.ldap.user_enabled_attribute = 'enabled' CONF.ldap.user_enabled_attribute = 'enabled'
@ -272,9 +235,6 @@ class LDAPIdentity(test.TestCase, test_backend.IdentityTests):
self.assertEqual(user_ref['enabled'], self.user_two['enabled']) self.assertEqual(user_ref['enabled'], self.user_two['enabled'])
def test_user_attribute_ignore(self): def test_user_attribute_ignore(self):
self.config([test.etcdir('keystone.conf.sample'),
test.testsdir('test_overrides.conf'),
test.testsdir('backend_ldap.conf')])
CONF.ldap.user_attribute_ignore = ['name', 'email', 'password', CONF.ldap.user_attribute_ignore = ['name', 'email', 'password',
'tenant_id', 'enabled', 'tenants'] 'tenant_id', 'enabled', 'tenants']
clear_database() clear_database()
@ -290,9 +250,6 @@ class LDAPIdentity(test.TestCase, test_backend.IdentityTests):
self.assertNotIn('tenants', user_ref) self.assertNotIn('tenants', user_ref)
def test_project_attribute_mapping(self): def test_project_attribute_mapping(self):
self.config([test.etcdir('keystone.conf.sample'),
test.testsdir('test_overrides.conf'),
test.testsdir('backend_ldap.conf')])
CONF.ldap.tenant_name_attribute = 'ou' CONF.ldap.tenant_name_attribute = 'ou'
CONF.ldap.tenant_desc_attribute = 'desc' CONF.ldap.tenant_desc_attribute = 'desc'
CONF.ldap.tenant_enabled_attribute = 'enabled' CONF.ldap.tenant_enabled_attribute = 'enabled'
@ -317,9 +274,6 @@ class LDAPIdentity(test.TestCase, test_backend.IdentityTests):
self.assertEqual(tenant_ref['enabled'], self.tenant_baz['enabled']) self.assertEqual(tenant_ref['enabled'], self.tenant_baz['enabled'])
def test_project_attribute_ignore(self): def test_project_attribute_ignore(self):
self.config([test.etcdir('keystone.conf.sample'),
test.testsdir('test_overrides.conf'),
test.testsdir('backend_ldap.conf')])
CONF.ldap.tenant_attribute_ignore = ['name', CONF.ldap.tenant_attribute_ignore = ['name',
'description', 'description',
'enabled'] 'enabled']
@ -333,9 +287,6 @@ class LDAPIdentity(test.TestCase, test_backend.IdentityTests):
self.assertNotIn('enabled', tenant_ref) self.assertNotIn('enabled', tenant_ref)
def test_role_attribute_mapping(self): def test_role_attribute_mapping(self):
self.config([test.etcdir('keystone.conf.sample'),
test.testsdir('test_overrides.conf'),
test.testsdir('backend_ldap.conf')])
CONF.ldap.role_name_attribute = 'ou' CONF.ldap.role_name_attribute = 'ou'
clear_database() clear_database()
self.identity_api = identity_ldap.Identity() self.identity_api = identity_ldap.Identity()
@ -351,9 +302,6 @@ class LDAPIdentity(test.TestCase, test_backend.IdentityTests):
self.assertNotIn('name', role_ref) self.assertNotIn('name', role_ref)
def test_role_attribute_ignore(self): def test_role_attribute_ignore(self):
self.config([test.etcdir('keystone.conf.sample'),
test.testsdir('test_overrides.conf'),
test.testsdir('backend_ldap.conf')])
CONF.ldap.role_attribute_ignore = ['name'] CONF.ldap.role_attribute_ignore = ['name']
clear_database() clear_database()
self.identity_api = identity_ldap.Identity() self.identity_api = identity_ldap.Identity()
@ -363,9 +311,6 @@ class LDAPIdentity(test.TestCase, test_backend.IdentityTests):
self.assertNotIn('name', role_ref) self.assertNotIn('name', role_ref)
def test_user_enable_attribute_mask(self): def test_user_enable_attribute_mask(self):
self.config([test.etcdir('keystone.conf.sample'),
test.testsdir('test_overrides.conf'),
test.testsdir('backend_ldap.conf')])
CONF.ldap.user_enabled_attribute = 'enabled' CONF.ldap.user_enabled_attribute = 'enabled'
CONF.ldap.user_enabled_mask = 2 CONF.ldap.user_enabled_mask = 2
CONF.ldap.user_enabled_default = 512 CONF.ldap.user_enabled_default = 512