diff options
| author | termie <github@anarkystic.com> | 2012-01-09 15:52:48 -0800 |
|---|---|---|
| committer | termie <github@anarkystic.com> | 2012-01-09 15:52:48 -0800 |
| commit | 3c88b7f546e727d8ae86901dd62b8230d1d85314 (patch) | |
| tree | 9dd249aa50ba9ed85c69e5edc8139e66930ec2f5 /tests/test_keystoneclient_sql.py | |
| parent | 43b683b3429e2e679e27428589290690bfd50bc2 (diff) | |
| download | keystone-3c88b7f546e727d8ae86901dd62b8230d1d85314.tar.gz keystone-3c88b7f546e727d8ae86901dd62b8230d1d85314.tar.xz keystone-3c88b7f546e727d8ae86901dd62b8230d1d85314.zip | |
merge test and default configs
Diffstat (limited to 'tests/test_keystoneclient_sql.py')
| -rw-r--r-- | tests/test_keystoneclient_sql.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/test_keystoneclient_sql.py b/tests/test_keystoneclient_sql.py index b19aff8f..2adcc745 100644 --- a/tests/test_keystoneclient_sql.py +++ b/tests/test_keystoneclient_sql.py @@ -12,5 +12,7 @@ CONF = config.CONF class KcMasterSqlTestCase(test_keystoneclient.KcMasterTestCase): def _config(self): - CONF(config_files=['default.conf', 'backend_sql.conf']) + CONF(config_files=[test.etcdir('keystone.conf'), + test.testsdir('test_overrides.conf'), + test.testsdir('backend_sql.conf')]) sql_util.setup_test_database() |