openstack
/
keystone
Code Issues Proposed changes

Rename keystone.conf to .sample. 

Fixes bug 966670.

Change-Id: Ic57c9971c4f3a14c30e2382c58c3d0da6b2a7957
This commit is contained in:
Josh Kearney 2012-04-09 15:39:11 -05:00
parent 75a8dfef51
commit f640093ba8
9 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -19,3 +19,4 @@ ChangeLog
requirements.txt
build/
dist/
etc/keystone.conf

0
etc/keystone.conf → etc/keystone.conf.sample
View File

6
keystone/test.py
View File

@ -131,7 +131,7 @@ class TestCase(unittest.TestCase):
self.stubs = stubout.StubOutForTesting()
def config(self):
CONF(config_files=[etcdir('keystone.conf'),
CONF(config_files=[etcdir('keystone.conf.sample'),
testsdir('test_overrides.conf')])
def tearDown(self):
@ -226,8 +226,8 @@ class TestCase(unittest.TestCase):
test_path = os.path.join(TESTSDIR, config)
etc_path = os.path.join(ROOTDIR, 'etc', config)
for path in [test_path, etc_path]:
if os.path.exists('%s.conf' % path):
return 'config:%s.conf' % path
if os.path.exists('%s.conf.sample' % path):
return 'config:%s.conf.sample' % path
return config
def loadapp(self, config, name='main'):

2
tests/_ldap_livetest.py
View File

@ -61,7 +61,7 @@ def clear_live_database():
class LDAPIdentity(test.TestCase, test_backend.IdentityTests):
def setUp(self):
super(LDAPIdentity, self).setUp()
CONF(config_files=[test.etcdir('keystone.conf'),
CONF(config_files=[test.etcdir('keystone.conf.sample'),
test.testsdir('test_overrides.conf'),
test.testsdir('backend_liveldap.conf')])
clear_live_database()

2
tests/test_backend_ldap.py
View File

@ -36,7 +36,7 @@ def clear_database():
class LDAPIdentity(test.TestCase, test_backend.IdentityTests):
def setUp(self):
super(LDAPIdentity, self).setUp()
CONF(config_files=[test.etcdir('keystone.conf'),
CONF(config_files=[test.etcdir('keystone.conf.sample'),
test.testsdir('test_overrides.conf'),
test.testsdir('backend_ldap.conf')])
clear_database()

4
tests/test_backend_sql.py
View File

@ -30,7 +30,7 @@ CONF = config.CONF
class SqlIdentity(test.TestCase, test_backend.IdentityTests):
def setUp(self):
super(SqlIdentity, self).setUp()
CONF(config_files=[test.etcdir('keystone.conf'),
CONF(config_files=[test.etcdir('keystone.conf.sample'),
test.testsdir('test_overrides.conf'),
test.testsdir('backend_sql.conf')])
sql_util.setup_test_database()
@ -52,7 +52,7 @@ class SqlIdentity(test.TestCase, test_backend.IdentityTests):
class SqlToken(test.TestCase, test_backend.TokenTests):
def setUp(self):
super(SqlToken, self).setUp()
CONF(config_files=[test.etcdir('keystone.conf'),
CONF(config_files=[test.etcdir('keystone.conf.sample'),
test.testsdir('test_overrides.conf'),
test.testsdir('backend_sql.conf')])
sql_util.setup_test_database()

2
tests/test_import_legacy.py
View File

@ -33,7 +33,7 @@ CONF = config.CONF
class ImportLegacy(test.TestCase):
def setUp(self):
super(ImportLegacy, self).setUp()
CONF(config_files=[test.etcdir('keystone.conf'),
CONF(config_files=[test.etcdir('keystone.conf.sample'),
test.testsdir('test_overrides.conf'),
test.testsdir('backend_sql.conf')])
sql_util.setup_test_database()

2
tests/test_keystoneclient_sql.py
View File

@ -28,7 +28,7 @@ CONF = config.CONF
class KcMasterSqlTestCase(test_keystoneclient.KcMasterTestCase):
def config(self):
CONF(config_files=[test.etcdir('keystone.conf'),
CONF(config_files=[test.etcdir('keystone.conf.sample'),
test.testsdir('test_overrides.conf'),
test.testsdir('backend_sql.conf')])
sql_util.setup_test_database()

2
tests/test_migrate_nova_auth.py
View File

@ -68,7 +68,7 @@ FIXTURE = {
class MigrateNovaAuth(test.TestCase):
def setUp(self):
super(MigrateNovaAuth, self).setUp()
CONF(config_files=[test.etcdir('keystone.conf'),
CONF(config_files=[test.etcdir('keystone.conf.sample'),
test.testsdir('test_overrides.conf'),
test.testsdir('backend_sql.conf')])
sql_util.setup_test_database()