summaryrefslogtreecommitdiffstats
path: root/tests/unit/db/test_api.py
diff options
context:
space:
mode:
Diffstat (limited to 'tests/unit/db/test_api.py')
-rw-r--r--tests/unit/db/test_api.py35
1 files changed, 31 insertions, 4 deletions
diff --git a/tests/unit/db/test_api.py b/tests/unit/db/test_api.py
index a31ffd0..f6e0d4c 100644
--- a/tests/unit/db/test_api.py
+++ b/tests/unit/db/test_api.py
@@ -32,9 +32,33 @@ class DBAPI(object):
class DBAPITestCase(test_utils.BaseTestCase):
+
+ def test_deprecated_dbapi_parameters(self):
+ paths = self.create_tempfiles([('test',
+ '[DEFAULT]\n'
+ 'db_backend=test_123\n'
+ 'dbapi_use_tpool=True\n'
+ )])
+
+ test_utils.CONF(['--config-file', paths[0]])
+ self.assertEquals(test_utils.CONF.database.backend, 'test_123')
+ self.assertEquals(test_utils.CONF.database.use_tpool, True)
+
+ def test_dbapi_parameters(self):
+ paths = self.create_tempfiles([('test',
+ '[database]\n'
+ 'backend=test_123\n'
+ 'use_tpool=True\n'
+ )])
+
+ test_utils.CONF(['--config-file', paths[0]])
+ self.assertEquals(test_utils.CONF.database.backend, 'test_123')
+ self.assertEquals(test_utils.CONF.database.use_tpool, True)
+
def test_dbapi_api_class_method_and_tpool_false(self):
backend_mapping = {'test_known': 'tests.unit.db.test_api'}
- self.config(db_backend='test_known', dbapi_use_tpool=False)
+ self.config(backend='test_known', use_tpool=False,
+ group='database')
info = dict(tpool=False)
orig_execute = tpool.execute
@@ -53,7 +77,8 @@ class DBAPITestCase(test_utils.BaseTestCase):
def test_dbapi_api_class_method_and_tpool_true(self):
backend_mapping = {'test_known': 'tests.unit.db.test_api'}
- self.config(db_backend='test_known', dbapi_use_tpool=True)
+ self.config(backend='test_known', use_tpool=True,
+ group='database')
info = dict(tpool=False)
orig_execute = tpool.execute
@@ -71,14 +96,16 @@ class DBAPITestCase(test_utils.BaseTestCase):
self.assertTrue(info['tpool'])
def test_dbapi_full_path_module_method(self):
- self.config(db_backend='tests.unit.db.test_api')
+ self.config(backend='tests.unit.db.test_api',
+ group='database')
dbapi = api.DBAPI()
result = dbapi.api_class_call1(1, 2, kwarg1='meow')
expected = ((1, 2), {'kwarg1': 'meow'})
self.assertEqual(expected, result)
def test_dbapi_unknown_invalid_backend(self):
- self.config(db_backend='tests.unit.db.not_existant')
+ self.config(backend='tests.unit.db.not_existent',
+ group='database')
dbapi = api.DBAPI()
def call_it():