diff options
| author | Gary Kotton <gkotton@redhat.com> | 2013-06-05 08:06:15 +0000 |
|---|---|---|
| committer | Gary Kotton <gkotton@redhat.com> | 2013-06-11 09:29:47 +0000 |
| commit | ebaa578351c9c6b47c2f28ef6d74451e1483036b (patch) | |
| tree | 3ec8c3b4ef05cf8aee733f6b95a05ca2b3276053 /tests/unit | |
| parent | faddbbe318cf62791624469c4304ae4fdcc2e639 (diff) | |
| download | oslo-ebaa578351c9c6b47c2f28ef6d74451e1483036b.tar.gz oslo-ebaa578351c9c6b47c2f28ef6d74451e1483036b.tar.xz oslo-ebaa578351c9c6b47c2f28ef6d74451e1483036b.zip | |
Enable user to configure pool_timeout
Fixes bug 1160442
In addition to this there are the following changes:
1. The set_default method can configure the QueuePool parameters
2. The max_pool_size is defaulted to the QueuePool default
Change-Id: Ie99f7fc4edba68127c4af508290d8074d7094be9
Diffstat (limited to 'tests/unit')
| -rw-r--r-- | tests/unit/db/sqlalchemy/test_sqlalchemy.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/unit/db/sqlalchemy/test_sqlalchemy.py b/tests/unit/db/sqlalchemy/test_sqlalchemy.py index e548a3b..e22476b 100644 --- a/tests/unit/db/sqlalchemy/test_sqlalchemy.py +++ b/tests/unit/db/sqlalchemy/test_sqlalchemy.py @@ -70,6 +70,7 @@ retry_interval=40 max_overflow=50 connection_debug=60 connection_trace=True +pool_timeout=7 """)]) test_utils.CONF(['--config-file', paths[0]]) self.assertEquals(test_utils.CONF.database.connection, 'x://y.z') @@ -80,6 +81,7 @@ connection_trace=True self.assertEquals(test_utils.CONF.database.max_overflow, 50) self.assertEquals(test_utils.CONF.database.connection_debug, 60) self.assertEquals(test_utils.CONF.database.connection_trace, True) + self.assertEquals(test_utils.CONF.database.pool_timeout, 7) class SessionErrorWrapperTestCase(test_utils.BaseTestCase): |