Remove use of deprecated oslo.db options

oslo.db 10.0.0 finally removes the deprecated '[database] idle_timeout'
option in favour of '[database] connection_recycle_time'. Update unit
tests to reflect this.

Change-Id: I3628f1cd438f3f2ca999ec89df4eef989c903b95
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>

6 files changed, 3 insertions, 58 deletions

diff --git a/keystone/tests/unit/config_files/backend_ldap_sql.conf b/keystone/tests/unit/config_files/backend_ldap_sql.conf
index 96a0ffa98..c50d8dd40 100644
--- a/keystone/tests/unit/config_files/backend_ldap_sql.conf
+++ b/keystone/tests/unit/config_files/backend_ldap_sql.conf
@@ -5,7 +5,7 @@
 #connection = mysql+pymysql://keystone:keystone@localhost/keystone?charset=utf8
 #To Test PostgreSQL:
 #connection = postgresql://keystone:keystone@localhost/keystone?client_encoding=utf8
-idle_timeout = 200
+connection_recycle_time = 200
 
 [ldap]
 url = fake://memory
diff --git a/keystone/tests/unit/config_files/backend_multi_ldap_sql.conf b/keystone/tests/unit/config_files/backend_multi_ldap_sql.conf
index 5185770b7..2795d5e28 100644
--- a/keystone/tests/unit/config_files/backend_multi_ldap_sql.conf
+++ b/keystone/tests/unit/config_files/backend_multi_ldap_sql.conf
@@ -6,4 +6,4 @@ connection = sqlite://
 #connection = mysql+pymysql://keystone:keystone@localhost/keystone?charset=utf8
 #To Test PostgreSQL:
 #connection = postgresql://keystone:keystone@localhost/keystone?client_encoding=utf8
-idle_timeout = 200
+connection_recycle_time = 200
diff --git a/keystone/tests/unit/config_files/backend_sql.conf b/keystone/tests/unit/config_files/backend_sql.conf
index f2828e2ef..bc15d2f8e 100644
--- a/keystone/tests/unit/config_files/backend_sql.conf
+++ b/keystone/tests/unit/config_files/backend_sql.conf
@@ -5,4 +5,4 @@
 #connection = mysql+pymysql://keystone:keystone@localhost/keystone?charset=utf8
 #To Test PostgreSQL:
 #connection = postgresql://keystone:keystone@localhost/keystone?client_encoding=utf8
-idle_timeout = 200
+connection_recycle_time = 200
diff --git a/keystone/tests/unit/config_files/deprecated.conf b/keystone/tests/unit/config_files/deprecated.conf
deleted file mode 100644
index 515e663a3..000000000
--- a/keystone/tests/unit/config_files/deprecated.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# Options in this file are deprecated. See test_config.
-
-[sql]
-# These options were deprecated in Icehouse with the switch to oslo's
-# db.sqlalchemy.
-
-connection = sqlite://deprecated
-idle_timeout = 54321
diff --git a/keystone/tests/unit/config_files/deprecated_override.conf b/keystone/tests/unit/config_files/deprecated_override.conf
deleted file mode 100644
index 1d1c926fe..000000000
--- a/keystone/tests/unit/config_files/deprecated_override.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-# Options in this file are deprecated. See test_config.
-
-[sql]
-# These options were deprecated in Icehouse with the switch to oslo's
-# db.sqlalchemy.
-
-connection = sqlite://deprecated
-idle_timeout = 54321
-
-
-[database]
-# These are the new options from the [sql] section.
-
-connection = sqlite://new
-idle_timeout = 65432
diff --git a/keystone/tests/unit/test_config.py b/keystone/tests/unit/test_config.py
index 634ccd9fe..321906b4f 100644
--- a/keystone/tests/unit/test_config.py
+++ b/keystone/tests/unit/test_config.py
@@ -41,35 +41,3 @@ class ConfigTestCase(unit.TestCase):
         self.assertIsNone(CONF.auth.token)
         # Check config.set_config_defaults() has set [profiler]enabled.
         self.assertEqual(False, CONF.profiler.enabled)
-
-
-class DeprecatedTestCase(unit.TestCase):
-    """Test using the original (deprecated) name for renamed options."""
-
-    def config_files(self):
-        config_files = super(DeprecatedTestCase, self).config_files()
-        config_files.append(unit.dirs.tests_conf('deprecated.conf'))
-        return config_files
-
-    def test_sql(self):
-        # Options in [sql] were moved to [database] in Icehouse for the change
-        # to use oslo-incubator's db.sqlalchemy.sessions.
-
-        self.assertEqual('sqlite://deprecated', CONF.database.connection)
-        self.assertEqual(54321, CONF.database.idle_timeout)
-
-
-class DeprecatedOverrideTestCase(unit.TestCase):
-    """Test using the deprecated AND new name for renamed options."""
-
-    def config_files(self):
-        config_files = super(DeprecatedOverrideTestCase, self).config_files()
-        config_files.append(unit.dirs.tests_conf('deprecated_override.conf'))
-        return config_files
-
-    def test_sql(self):
-        # Options in [sql] were moved to [database] in Icehouse for the change
-        # to use oslo-incubator's db.sqlalchemy.sessions.
-
-        self.assertEqual('sqlite://new', CONF.database.connection)
-        self.assertEqual(65432, CONF.database.idle_timeout)