openstack
/
keystone
Code Issues Proposed changes

Merge "Do not use keystone.conf.sample in tests"

This commit is contained in:
Jenkins 2014-03-17 03:11:30 +00:00 committed by Gerrit Code Review
parent f5f42edb26 f4901ea023
commit 5180cf10c4
12 changed files with 30 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
keystone/tests/_ldap_livetest.py
View File

@ -70,8 +70,7 @@ class LiveLDAPIdentity(test_backend_ldap.LDAPIdentity):
'ou': 'UserGroups'})
def _set_config(self):
self.config([tests.dirs.etc('keystone.conf.sample'),
tests.dirs.tests('test_overrides.conf'),
self.config([tests.dirs.tests('test_overrides.conf'),
tests.dirs.tests('backend_liveldap.conf')])
def test_build_tree(self):

3
keystone/tests/_ldap_tls_livetest.py
View File

@ -37,8 +37,7 @@ def create_object(dn, attrs):
class LiveTLSLDAPIdentity(_ldap_livetest.LiveLDAPIdentity):
def _set_config(self):
self.config([tests.dirs.etc('keystone.conf.sample'),
tests.dirs.tests('test_overrides.conf'),
self.config([tests.dirs.tests('test_overrides.conf'),
tests.dirs.tests('backend_tls_liveldap.conf')])
def test_tls_certfile_demand_option(self):

3
keystone/tests/core.py
View File

@ -350,8 +350,7 @@ class BaseTestCase(testtools.TestCase):
class TestCase(BaseTestCase):
_config_file_list = [dirs.etc('keystone.conf.sample'),
dirs.tests('test_overrides.conf')]
_config_file_list = [dirs.tests('test_overrides.conf')]
def config_files(self):
return copy.copy(self._config_file_list)

6
keystone/tests/test_auth_plugin.py
View File

@ -66,8 +66,7 @@ class TestAuthPlugin(tests.TestCase):
self.api = auth.controllers.Auth()
def config_files(self):
return [tests.dirs.etc('keystone.conf.sample'),
tests.dirs.tests('test_overrides.conf'),
return [tests.dirs.tests('test_overrides.conf'),
tests.dirs.tests('backend_sql.conf'),
tests.dirs.tests('test_auth_plugin.conf')]
@ -127,8 +126,7 @@ class TestAuthPlugin(tests.TestCase):
class TestByClassNameAuthMethodRegistration(TestAuthPlugin):
def config_files(self):
return [tests.dirs.etc('keystone.conf.sample'),
tests.dirs.tests('test_overrides.conf'),
return [tests.dirs.tests('test_overrides.conf'),
tests.dirs.tests('backend_sql.conf'),
tests.dirs.tests('test_auth_plugin_by_class_name.conf')]

24
keystone/tests/test_backend_ldap.py
View File

@ -53,8 +53,7 @@ class BaseLDAPIdentity(test_backend.IdentityTests):
return CONF
def _set_config(self):
self.config([tests.dirs.etc('keystone.conf.sample'),
tests.dirs.tests('test_overrides.conf'),
self.config([tests.dirs.tests('test_overrides.conf'),
tests.dirs.tests('backend_ldap.conf')])
def test_build_tree(self):
@ -854,8 +853,7 @@ class LDAPIdentity(tests.TestCase, BaseLDAPIdentity):
def test_user_api_get_connection_no_user_password(self):
"""Don't bind in case the user and password are blank."""
self.config([tests.dirs.etc('keystone.conf.sample'),
tests.dirs.tests('test_overrides.conf')])
self.config([tests.dirs.tests('test_overrides.conf')])
CONF.ldap.url = "fake://memory"
user_api = identity.backends.ldap.UserApi(CONF)
self.stubs.Set(fakeldap, 'FakeLdap',
@ -1113,8 +1111,7 @@ class LDAPIdentity(tests.TestCase, BaseLDAPIdentity):
class LDAPIdentityEnabledEmulation(LDAPIdentity):
def setUp(self):
super(LDAPIdentityEnabledEmulation, self).setUp()
self.config([tests.dirs.etc('keystone.conf.sample'),
tests.dirs.tests('test_overrides.conf'),
self.config([tests.dirs.tests('test_overrides.conf'),
tests.dirs.tests('backend_ldap.conf')])
self.clear_database()
self.load_backends()
@ -1191,8 +1188,7 @@ class LDAPIdentityEnabledEmulation(LDAPIdentity):
class LdapIdentitySqlAssignment(tests.TestCase, BaseLDAPIdentity):
def _set_config(self):
self.config([tests.dirs.etc('keystone.conf.sample'),
tests.dirs.tests('test_overrides.conf'),
self.config([tests.dirs.tests('test_overrides.conf'),
tests.dirs.tests('backend_ldap_sql.conf')])
def setUp(self):
@ -1296,8 +1292,7 @@ class MultiLDAPandSQLIdentity(tests.TestCase, BaseLDAPIdentity):
self.load_fixtures(default_fixtures)
def _set_config(self):
self.config([tests.dirs.etc('keystone.conf.sample'),
tests.dirs.tests('test_overrides.conf'),
self.config([tests.dirs.tests('test_overrides.conf'),
tests.dirs.tests('backend_multi_ldap_sql.conf')])
def _setup_domain_test_data(self):
@ -1326,22 +1321,19 @@ class MultiLDAPandSQLIdentity(tests.TestCase, BaseLDAPIdentity):
# test overrides are included.
self.identity_api.domain_configs._load_config(
self.identity_api.assignment_api,
[tests.dirs.etc('keystone.conf.sample'),
tests.dirs.tests('test_overrides.conf'),
[tests.dirs.tests('test_overrides.conf'),
tests.dirs.tests('backend_multi_ldap_sql.conf'),
tests.dirs.tests('keystone.Default.conf')],
'Default')
self.identity_api.domain_configs._load_config(
self.identity_api.assignment_api,
[tests.dirs.etc('keystone.conf.sample'),
tests.dirs.tests('test_overrides.conf'),
[tests.dirs.tests('test_overrides.conf'),
tests.dirs.tests('backend_multi_ldap_sql.conf'),
tests.dirs.tests('keystone.domain1.conf')],
'domain1')
self.identity_api.domain_configs._load_config(
self.identity_api.assignment_api,
[tests.dirs.etc('keystone.conf.sample'),
tests.dirs.tests('test_overrides.conf'),
[tests.dirs.tests('test_overrides.conf'),
tests.dirs.tests('backend_multi_ldap_sql.conf'),
tests.dirs.tests('keystone.domain2.conf')],
'domain2')

3
keystone/tests/test_backend_rules.py
View File

@ -21,8 +21,7 @@ from keystone.tests import test_backend
class RulesPolicy(tests.TestCase, test_backend.PolicyTests):
def setUp(self):
super(RulesPolicy, self).setUp()
self.config([tests.dirs.etc('keystone.conf.sample'),
tests.dirs.tests('test_overrides.conf'),
self.config([tests.dirs.tests('test_overrides.conf'),
tests.dirs.tests('backend_rules.conf')])
self.load_backends()

3
keystone/tests/test_backend_sql.py
View File

@ -38,8 +38,7 @@ class SqlTests(tests.TestCase):
def setUp(self):
super(SqlTests, self).setUp()
self.config([tests.dirs.etc('keystone.conf.sample'),
tests.dirs.tests('test_overrides.conf'),
self.config([tests.dirs.tests('test_overrides.conf'),
tests.dirs.tests('backend_sql.conf')])
self.load_backends()

15
keystone/tests/test_config.py
View File

@ -23,6 +23,15 @@ CONF = config.CONF
class ConfigTestCase(tests.TestCase):
def config_files(self):
config_files = super(ConfigTestCase, self).config_files()
# Insert the keystone sample as the first config file to be loaded
# since it is used in one of the code paths to determine the paste-ini
# location.
config_files.insert(0, tests.dirs.etc('keystone.conf.sample'))
return config_files
def test_paste_config(self):
self.assertEqual(config.find_paste_config(),
tests.dirs.etc('keystone-paste.ini'))
@ -46,8 +55,7 @@ class DeprecatedTestCase(tests.TestCase):
def setUp(self):
super(DeprecatedTestCase, self).setUp()
self.config([tests.dirs.etc('keystone.conf.sample'),
tests.dirs.tests('test_overrides.conf'),
self.config([tests.dirs.tests('test_overrides.conf'),
tests.dirs.tests('deprecated.conf'), ])
def test_sql(self):
@ -63,8 +71,7 @@ class DeprecatedOverrideTestCase(tests.TestCase):
def setUp(self):
super(DeprecatedOverrideTestCase, self).setUp()
self.config([tests.dirs.etc('keystone.conf.sample'),
tests.dirs.tests('test_overrides.conf'),
self.config([tests.dirs.tests('test_overrides.conf'),
tests.dirs.tests('deprecated_override.conf'), ])
def test_sql(self):

1
keystone/tests/test_keystoneclient_sql.py
View File

@ -28,7 +28,6 @@ CONF = config.CONF
class KcMasterSqlTestCase(test_keystoneclient.KcMasterTestCase):
def config(self, config_files):
super(KcMasterSqlTestCase, self).config([
tests.dirs.etc('keystone.conf.sample'),
tests.dirs.tests('test_overrides.conf'),
tests.dirs.tests('backend_sql.conf')])

8
keystone/tests/test_revoke.py
View File

@ -174,17 +174,13 @@ class RevokeTests(object):
class SqlRevokeTests(test_backend_sql.SqlTests, RevokeTests):
def setUp(self):
super(SqlRevokeTests, self).setUp()
self.config([tests.dirs.etc('keystone.conf.sample'),
tests.dirs.tests(
'test_revoke_sql.conf')])
self.config([tests.dirs.tests('test_revoke_sql.conf')])
class KvsRevokeTests(tests.TestCase, RevokeTests):
def setUp(self):
super(KvsRevokeTests, self).setUp()
self.config([tests.dirs.etc('keystone.conf.sample'),
tests.dirs.tests(
'test_revoke_kvs.conf')])
self.config([tests.dirs.tests('test_revoke_kvs.conf')])
self.load_backends()

3
keystone/tests/test_sql_upgrade.py
View File

@ -61,8 +61,7 @@ class SqlMigrateBase(tests.TestCase):
self.metadata = sqlalchemy.MetaData()
self.metadata.bind = self.engine
_config_file_list = [tests.dirs.etc('keystone.conf.sample'),
tests.dirs.tests('test_overrides.conf'),
_config_file_list = [tests.dirs.tests('test_overrides.conf'),
tests.dirs.tests('backend_sql.conf')]
#override this to specify the complete list of configuration files

3
keystone/tests/test_v3.py
View File

@ -38,8 +38,7 @@ TIME_FORMAT = '%Y-%m-%dT%H:%M:%S.%fZ'
class RestfulTestCase(rest.RestfulTestCase):
_config_file_list = [tests.dirs.etc('keystone.conf.sample'),
tests.dirs.tests('test_overrides.conf'),
_config_file_list = [tests.dirs.tests('test_overrides.conf'),
tests.dirs.tests('backend_sql.conf')]
#Subclasses can override this to specify the complete list of configuration