Move test .conf files to keystone/tests/config_files

Move the test configuration files to an isolated directory. This
allows for less clutter in the keystone/tests directory and keeps
the configuration data a bit more isolated from the test cases
themselves.

Change-Id: I054393b968824a0e3c31fd227d7b09e9c14c764b

keystone/tests/_ldap_livetest.py

@@ -71,7 +71,7 @@ class LiveLDAPIdentity(test_backend_ldap.LDAPIdentity):
 
     def config_files(self):
         config_files = super(LiveLDAPIdentity, self).config_files()
-        config_files.append(tests.dirs.tests('backend_liveldap.conf'))
+        config_files.append(tests.dirs.tests_conf('backend_liveldap.conf'))
         return config_files
 
     def config_overrides(self):

keystone/tests/_ldap_tls_livetest.py

@@ -38,7 +38,7 @@ class LiveTLSLDAPIdentity(_ldap_livetest.LiveLDAPIdentity):
 
     def config_files(self):
         config_files = super(LiveTLSLDAPIdentity, self).config_files()
-        config_files.append(tests.dirs.tests('backend_tls_liveldap.conf'))
+        config_files.append(tests.dirs.tests_conf('backend_tls_liveldap.conf'))
         return config_files
 
     def config_overrides(self):

keystone/tests/_sql_livetest.py

@@ -25,7 +25,7 @@ class PostgresqlMigrateTests(test_sql_upgrade.SqlUpgradeTests):
     def config_files(self):
         files = (test_sql_upgrade.SqlUpgradeTests.
                  _config_file_list[:])
-        files.append(tests.dirs.tests("backend_postgresql.conf"))
+        files.append(tests.dirs.tests_conf("backend_postgresql.conf"))
         return files
 
 
@@ -33,7 +33,7 @@ class MysqlMigrateTests(test_sql_upgrade.SqlUpgradeTests):
     def config_files(self):
         files = (test_sql_upgrade.SqlUpgradeTests.
                  _config_file_list[:])
-        files.append(tests.dirs.tests("backend_mysql.conf"))
+        files.append(tests.dirs.tests_conf("backend_mysql.conf"))
         return files
 
 
@@ -42,7 +42,7 @@ class PostgresqlRevokeExtensionsTests(
     def config_files(self):
         files = (test_sql_upgrade.SqlUpgradeTests.
                  _config_file_list[:])
-        files.append(tests.dirs.tests("backend_postgresql.conf"))
+        files.append(tests.dirs.tests_conf("backend_postgresql.conf"))
         return files
 
 
@@ -50,7 +50,7 @@ class MysqlRevokeExtensionsTests(test_sql_migrate_extensions.RevokeExtension):
     def config_files(self):
         files = (test_sql_upgrade.SqlUpgradeTests.
                  _config_file_list[:])
-        files.append(tests.dirs.tests("backend_mysql.conf"))
+        files.append(tests.dirs.tests_conf("backend_mysql.conf"))
         return files
 
 
@@ -58,5 +58,5 @@ class Db2MigrateTests(test_sql_upgrade.SqlUpgradeTests):
     def config_files(self):
         files = (test_sql_upgrade.SqlUpgradeTests.
                  _config_file_list[:])
-        files.append(tests.dirs.tests("backend_db2.conf"))
+        files.append(tests.dirs.tests_conf("backend_db2.conf"))
         return files

keystone/tests/core.py

@@ -78,6 +78,7 @@ config.configure()
 
 LOG = log.getLogger(__name__)
 TESTSDIR = os.path.dirname(os.path.abspath(__file__))
+TESTCONF = os.path.join(TESTSDIR, 'config_files')
 ROOTDIR = os.path.normpath(os.path.join(TESTSDIR, '..', '..'))
 VENDOR = os.path.join(ROOTDIR, 'vendor')
 ETCDIR = os.path.join(ROOTDIR, 'etc')
@@ -114,6 +115,10 @@ class dirs:
     def tmp(*p):
         return os.path.join(TMPDIR, *p)
 
+    @staticmethod
+    def tests_conf(*p):
+        return os.path.join(TESTCONF, *p)
+
 
 # keystone.common.sql.initialize() for testing.
 def _initialize_sql_session():

keystone/tests/test_auth.py

@@ -974,7 +974,7 @@ class AuthCatalog(tests.SQLDriverOverrides, AuthTest):
         config_files = super(AuthCatalog, self).config_files()
         # We need to use a backend that supports disabled endpoints, like the
         # SQL backend.
-        config_files.append(tests.dirs.tests('backend_sql.conf'))
+        config_files.append(tests.dirs.tests_conf('backend_sql.conf'))
         return config_files
 
     def _create_endpoints(self):

keystone/tests/test_auth_plugin.py

@@ -67,7 +67,7 @@ class TestAuthPlugin(tests.SQLDriverOverrides, tests.TestCase):
 
     def config_files(self):
         config_files = super(TestAuthPlugin, self).config_files()
-        config_files.append(tests.dirs.tests('test_auth_plugin.conf'))
+        config_files.append(tests.dirs.tests_conf('test_auth_plugin.conf'))
         return config_files
 
     def config_overrides(self):
@@ -138,7 +138,7 @@ class TestAuthPluginDynamicOptions(TestAuthPlugin):
 
     def config_files(self):
         config_files = super(TestAuthPluginDynamicOptions, self).config_files()
-        config_files.append(tests.dirs.tests('test_auth_plugin.conf'))
+        config_files.append(tests.dirs.tests_conf('test_auth_plugin.conf'))
         return config_files
 
 

keystone/tests/test_backend_ldap.py

@@ -60,7 +60,7 @@ class BaseLDAPIdentity(test_backend.IdentityTests):
 
     def config_files(self):
         config_files = super(BaseLDAPIdentity, self).config_files()
-        config_files.append(tests.dirs.tests('backend_ldap.conf'))
+        config_files.append(tests.dirs.tests_conf('backend_ldap.conf'))
         return config_files
 
     def test_build_tree(self):
@@ -1126,7 +1126,7 @@ class LDAPIdentityEnabledEmulation(LDAPIdentity):
 
     def config_files(self):
         config_files = super(LDAPIdentityEnabledEmulation, self).config_files()
-        config_files.append(tests.dirs.tests('backend_ldap.conf'))
+        config_files.append(tests.dirs.tests_conf('backend_ldap.conf'))
         return config_files
 
     def config_overrides(self):
@@ -1199,7 +1199,7 @@ class LdapIdentitySqlAssignment(BaseLDAPIdentity, tests.SQLDriverOverrides,
 
     def config_files(self):
         config_files = super(LdapIdentitySqlAssignment, self).config_files()
-        config_files.append(tests.dirs.tests('backend_ldap_sql.conf'))
+        config_files.append(tests.dirs.tests_conf('backend_ldap_sql.conf'))
         return config_files
 
     def setUp(self):
@@ -1347,15 +1347,15 @@ class MultiLDAPandSQLIdentity(BaseLDAPIdentity, tests.SQLDriverOverrides,
         # test overrides are included.
         self.identity_api.domain_configs._load_config(
             self.identity_api.assignment_api,
-            [tests.dirs.tests('keystone.Default.conf')],
+            [tests.dirs.tests_conf('keystone.Default.conf')],
             'Default')
         self.identity_api.domain_configs._load_config(
             self.identity_api.assignment_api,
-            [tests.dirs.tests('keystone.domain1.conf')],
+            [tests.dirs.tests_conf('keystone.domain1.conf')],
             'domain1')
         self.identity_api.domain_configs._load_config(
             self.identity_api.assignment_api,
-            [tests.dirs.tests('keystone.domain2.conf')],
+            [tests.dirs.tests_conf('keystone.domain2.conf')],
             'domain2')
 
     def reload_backends(self, domain_id):

keystone/tests/test_backend_sql.py

@@ -47,7 +47,7 @@ class SqlTests(tests.SQLDriverOverrides, tests.TestCase):
 
     def config_files(self):
         config_files = super(SqlTests, self).config_files()
-        config_files.append(tests.dirs.tests('backend_sql.conf'))
+        config_files.append(tests.dirs.tests_conf('backend_sql.conf'))
         return config_files
 
 

keystone/tests/test_config.py

@@ -55,7 +55,7 @@ class DeprecatedTestCase(tests.TestCase):
 
     def config_files(self):
         config_files = super(DeprecatedTestCase, self).config_files()
-        config_files.append(tests.dirs.tests('deprecated.conf'))
+        config_files.append(tests.dirs.tests_conf('deprecated.conf'))
         return config_files
 
     def test_sql(self):
@@ -71,7 +71,7 @@ class DeprecatedOverrideTestCase(tests.TestCase):
 
     def config_files(self):
         config_files = super(DeprecatedOverrideTestCase, self).config_files()
-        config_files.append(tests.dirs.tests('deprecated_override.conf'))
+        config_files.append(tests.dirs.tests_conf('deprecated_override.conf'))
         return config_files
 
     def test_sql(self):

keystone/tests/test_keystoneclient_sql.py

@@ -28,7 +28,7 @@ CONF = config.CONF
 class KcMasterSqlTestCase(test_keystoneclient.KcMasterTestCase):
     def config_files(self):
         config_files = super(KcMasterSqlTestCase, self).config_files()
-        config_files.append(tests.dirs.tests('backend_sql.conf'))
+        config_files.append(tests.dirs.tests_conf('backend_sql.conf'))
         return config_files
 
     def setUp(self):

keystone/tests/test_sql_upgrade.py

@@ -63,7 +63,7 @@ class SqlMigrateBase(tests.SQLDriverOverrides, tests.TestCase):
 
     def config_files(self):
         config_files = super(SqlMigrateBase, self).config_files()
-        config_files.append(tests.dirs.tests('backend_sql.conf'))
+        config_files.append(tests.dirs.tests_conf('backend_sql.conf'))
         return config_files
 
     def repo_package(self):

keystone/tests/test_v3.py

@@ -39,7 +39,7 @@ TIME_FORMAT = '%Y-%m-%dT%H:%M:%S.%fZ'
 class RestfulTestCase(tests.SQLDriverOverrides, rest.RestfulTestCase):
     def config_files(self):
         config_files = super(RestfulTestCase, self).config_files()
-        config_files.append(tests.dirs.tests('backend_sql.conf'))
+        config_files.append(tests.dirs.tests_conf('backend_sql.conf'))
         return config_files
 
     def setup_database(self):