From be9d13fb67b152cf510ce80eb3eb74383cc7940d Mon Sep 17 00:00:00 2001
From: Morgan Fainberg <m@metacloud.com>
Date: Mon, 10 Mar 2014 20:28:29 -0700
Subject: [PATCH] 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                     |  2 +-
 keystone/tests/_ldap_tls_livetest.py                 |  2 +-
 keystone/tests/_sql_livetest.py                      | 10 +++++-----
 keystone/tests/{ => config_files}/backend_db2.conf   |  0
 keystone/tests/{ => config_files}/backend_ldap.conf  |  0
 .../tests/{ => config_files}/backend_ldap_sql.conf   |  0
 .../tests/{ => config_files}/backend_liveldap.conf   |  0
 .../{ => config_files}/backend_multi_ldap_sql.conf   |  0
 keystone/tests/{ => config_files}/backend_mysql.conf |  0
 .../tests/{ => config_files}/backend_postgresql.conf |  0
 keystone/tests/{ => config_files}/backend_sql.conf   |  0
 .../{ => config_files}/backend_tls_liveldap.conf     |  0
 keystone/tests/{ => config_files}/deprecated.conf    |  0
 .../{ => config_files}/deprecated_override.conf      |  0
 .../tests/{ => config_files}/keystone.Default.conf   |  0
 .../tests/{ => config_files}/keystone.domain1.conf   |  0
 .../tests/{ => config_files}/keystone.domain2.conf   |  0
 .../tests/{ => config_files}/test_auth_plugin.conf   |  0
 keystone/tests/core.py                               |  5 +++++
 keystone/tests/test_auth.py                          |  2 +-
 keystone/tests/test_auth_plugin.py                   |  4 ++--
 keystone/tests/test_backend_ldap.py                  | 12 ++++++------
 keystone/tests/test_backend_sql.py                   |  2 +-
 keystone/tests/test_config.py                        |  4 ++--
 keystone/tests/test_keystoneclient_sql.py            |  2 +-
 keystone/tests/test_sql_upgrade.py                   |  2 +-
 keystone/tests/test_v3.py                            |  2 +-
 27 files changed, 27 insertions(+), 22 deletions(-)
 rename keystone/tests/{ => config_files}/backend_db2.conf (100%)
 rename keystone/tests/{ => config_files}/backend_ldap.conf (100%)
 rename keystone/tests/{ => config_files}/backend_ldap_sql.conf (100%)
 rename keystone/tests/{ => config_files}/backend_liveldap.conf (100%)
 rename keystone/tests/{ => config_files}/backend_multi_ldap_sql.conf (100%)
 rename keystone/tests/{ => config_files}/backend_mysql.conf (100%)
 rename keystone/tests/{ => config_files}/backend_postgresql.conf (100%)
 rename keystone/tests/{ => config_files}/backend_sql.conf (100%)
 rename keystone/tests/{ => config_files}/backend_tls_liveldap.conf (100%)
 rename keystone/tests/{ => config_files}/deprecated.conf (100%)
 rename keystone/tests/{ => config_files}/deprecated_override.conf (100%)
 rename keystone/tests/{ => config_files}/keystone.Default.conf (100%)
 rename keystone/tests/{ => config_files}/keystone.domain1.conf (100%)
 rename keystone/tests/{ => config_files}/keystone.domain2.conf (100%)
 rename keystone/tests/{ => config_files}/test_auth_plugin.conf (100%)

diff --git a/keystone/tests/_ldap_livetest.py b/keystone/tests/_ldap_livetest.py
index 33514ca7b..01584fb03 100644
--- a/keystone/tests/_ldap_livetest.py
+++ b/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):
diff --git a/keystone/tests/_ldap_tls_livetest.py b/keystone/tests/_ldap_tls_livetest.py
index c3d2a505a..b67761f48 100644
--- a/keystone/tests/_ldap_tls_livetest.py
+++ b/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):
diff --git a/keystone/tests/_sql_livetest.py b/keystone/tests/_sql_livetest.py
index c6577ed9a..b1205e64e 100644
--- a/keystone/tests/_sql_livetest.py
+++ b/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
diff --git a/keystone/tests/backend_db2.conf b/keystone/tests/config_files/backend_db2.conf
similarity index 100%
rename from keystone/tests/backend_db2.conf
rename to keystone/tests/config_files/backend_db2.conf
diff --git a/keystone/tests/backend_ldap.conf b/keystone/tests/config_files/backend_ldap.conf
similarity index 100%
rename from keystone/tests/backend_ldap.conf
rename to keystone/tests/config_files/backend_ldap.conf
diff --git a/keystone/tests/backend_ldap_sql.conf b/keystone/tests/config_files/backend_ldap_sql.conf
similarity index 100%
rename from keystone/tests/backend_ldap_sql.conf
rename to keystone/tests/config_files/backend_ldap_sql.conf
diff --git a/keystone/tests/backend_liveldap.conf b/keystone/tests/config_files/backend_liveldap.conf
similarity index 100%
rename from keystone/tests/backend_liveldap.conf
rename to keystone/tests/config_files/backend_liveldap.conf
diff --git a/keystone/tests/backend_multi_ldap_sql.conf b/keystone/tests/config_files/backend_multi_ldap_sql.conf
similarity index 100%
rename from keystone/tests/backend_multi_ldap_sql.conf
rename to keystone/tests/config_files/backend_multi_ldap_sql.conf
diff --git a/keystone/tests/backend_mysql.conf b/keystone/tests/config_files/backend_mysql.conf
similarity index 100%
rename from keystone/tests/backend_mysql.conf
rename to keystone/tests/config_files/backend_mysql.conf
diff --git a/keystone/tests/backend_postgresql.conf b/keystone/tests/config_files/backend_postgresql.conf
similarity index 100%
rename from keystone/tests/backend_postgresql.conf
rename to keystone/tests/config_files/backend_postgresql.conf
diff --git a/keystone/tests/backend_sql.conf b/keystone/tests/config_files/backend_sql.conf
similarity index 100%
rename from keystone/tests/backend_sql.conf
rename to keystone/tests/config_files/backend_sql.conf
diff --git a/keystone/tests/backend_tls_liveldap.conf b/keystone/tests/config_files/backend_tls_liveldap.conf
similarity index 100%
rename from keystone/tests/backend_tls_liveldap.conf
rename to keystone/tests/config_files/backend_tls_liveldap.conf
diff --git a/keystone/tests/deprecated.conf b/keystone/tests/config_files/deprecated.conf
similarity index 100%
rename from keystone/tests/deprecated.conf
rename to keystone/tests/config_files/deprecated.conf
diff --git a/keystone/tests/deprecated_override.conf b/keystone/tests/config_files/deprecated_override.conf
similarity index 100%
rename from keystone/tests/deprecated_override.conf
rename to keystone/tests/config_files/deprecated_override.conf
diff --git a/keystone/tests/keystone.Default.conf b/keystone/tests/config_files/keystone.Default.conf
similarity index 100%
rename from keystone/tests/keystone.Default.conf
rename to keystone/tests/config_files/keystone.Default.conf
diff --git a/keystone/tests/keystone.domain1.conf b/keystone/tests/config_files/keystone.domain1.conf
similarity index 100%
rename from keystone/tests/keystone.domain1.conf
rename to keystone/tests/config_files/keystone.domain1.conf
diff --git a/keystone/tests/keystone.domain2.conf b/keystone/tests/config_files/keystone.domain2.conf
similarity index 100%
rename from keystone/tests/keystone.domain2.conf
rename to keystone/tests/config_files/keystone.domain2.conf
diff --git a/keystone/tests/test_auth_plugin.conf b/keystone/tests/config_files/test_auth_plugin.conf
similarity index 100%
rename from keystone/tests/test_auth_plugin.conf
rename to keystone/tests/config_files/test_auth_plugin.conf
diff --git a/keystone/tests/core.py b/keystone/tests/core.py
index 1390e3ebd..2b3187fc6 100644
--- a/keystone/tests/core.py
+++ b/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():
diff --git a/keystone/tests/test_auth.py b/keystone/tests/test_auth.py
index 395d01e33..5f57b0579 100644
--- a/keystone/tests/test_auth.py
+++ b/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):
diff --git a/keystone/tests/test_auth_plugin.py b/keystone/tests/test_auth_plugin.py
index 2b8049044..98040f73a 100644
--- a/keystone/tests/test_auth_plugin.py
+++ b/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
 
 
diff --git a/keystone/tests/test_backend_ldap.py b/keystone/tests/test_backend_ldap.py
index 0391b3d56..d344bafba 100644
--- a/keystone/tests/test_backend_ldap.py
+++ b/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):
diff --git a/keystone/tests/test_backend_sql.py b/keystone/tests/test_backend_sql.py
index b6c45c841..a02ed866e 100644
--- a/keystone/tests/test_backend_sql.py
+++ b/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
 
 
diff --git a/keystone/tests/test_config.py b/keystone/tests/test_config.py
index 74b1fd32d..285f29b0d 100644
--- a/keystone/tests/test_config.py
+++ b/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):
diff --git a/keystone/tests/test_keystoneclient_sql.py b/keystone/tests/test_keystoneclient_sql.py
index 141d23084..353d9cb42 100644
--- a/keystone/tests/test_keystoneclient_sql.py
+++ b/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):
diff --git a/keystone/tests/test_sql_upgrade.py b/keystone/tests/test_sql_upgrade.py
index b5df94295..1bce4d7dd 100644
--- a/keystone/tests/test_sql_upgrade.py
+++ b/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):
diff --git a/keystone/tests/test_v3.py b/keystone/tests/test_v3.py
index 8033cc078..c4b7fd790 100644
--- a/keystone/tests/test_v3.py
+++ b/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):