summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorGary Kotton <gkotton@redhat.com>2013-06-22 07:14:09 +0000
committerGary Kotton <gkotton@redhat.com>2013-06-22 07:14:09 +0000
commit489e2b73f33d40ad34492fa7993f91bc52a8a66e (patch)
tree5a5a430240a85e988d85a47ea3656131b33f1c13 /tests
parentba32f8ecb33403885ea521e3c2dcc4b49a81bd71 (diff)
downloadoslo-489e2b73f33d40ad34492fa7993f91bc52a8a66e.tar.gz
oslo-489e2b73f33d40ad34492fa7993f91bc52a8a66e.tar.xz
oslo-489e2b73f33d40ad34492fa7993f91bc52a8a66e.zip
Ensure that DB configuration is backward compatible
Fixes bug 1193557 Change-Id: I483099b205c71d66cf97522307d8265abe83a488
Diffstat (limited to 'tests')
-rw-r--r--tests/unit/db/sqlalchemy/test_sqlalchemy.py24
1 files changed, 24 insertions, 0 deletions
diff --git a/tests/unit/db/sqlalchemy/test_sqlalchemy.py b/tests/unit/db/sqlalchemy/test_sqlalchemy.py
index ac178b8..46a0cb2 100644
--- a/tests/unit/db/sqlalchemy/test_sqlalchemy.py
+++ b/tests/unit/db/sqlalchemy/test_sqlalchemy.py
@@ -85,6 +85,30 @@ pool_timeout=7
self.assertEquals(test_utils.CONF.database.connection_trace, True)
self.assertEquals(test_utils.CONF.database.pool_timeout, 7)
+ def test_dbapi_database_deprecated_parameters(self):
+ paths = self.create_tempfiles([('test',
+ '[DATABASE]\n'
+ 'sql_connection=fake_connection\n'
+ 'sql_idle_timeout=100\n'
+ 'sql_min_pool_size=99\n'
+ 'sql_max_pool_size=199\n'
+ 'sql_max_retries=22\n'
+ 'reconnect_interval=17\n'
+ 'sqlalchemy_max_overflow=101\n'
+ 'sqlalchemy_pool_timeout=5\n'
+ )])
+
+ test_utils.CONF(['--config-file', paths[0]])
+ self.assertEquals(test_utils.CONF.database.connection,
+ 'fake_connection')
+ self.assertEquals(test_utils.CONF.database.idle_timeout, 100)
+ self.assertEquals(test_utils.CONF.database.min_pool_size, 99)
+ self.assertEquals(test_utils.CONF.database.max_pool_size, 199)
+ self.assertEquals(test_utils.CONF.database.max_retries, 22)
+ self.assertEquals(test_utils.CONF.database.retry_interval, 17)
+ self.assertEquals(test_utils.CONF.database.max_overflow, 101)
+ self.assertEquals(test_utils.CONF.database.pool_timeout, 5)
+
class SessionErrorWrapperTestCase(test_base.DbTestCase):
def setUp(self):