summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-08-23 08:25:45 +0000
committerGerrit Code Review <review@openstack.org>2014-08-23 08:25:45 +0000
commit4c7fc3e685e92880f48259fbec9ed72b471af89e (patch)
tree1cffdcddb093476a7ae2bec677786dbc3e43502e
parent93f41a43efb90d0d718e4b7b1f8dbe1d6f218f94 (diff)
parent977869d5535e3c9fe1220f31eaa738912c92ae46 (diff)
downloadoslo-db-4c7fc3e685e92880f48259fbec9ed72b471af89e.tar.gz
Merge "Remove reliance on create_engine() from TestsExceptionFilter"
-rw-r--r--tests/sqlalchemy/test_exc_filters.py11
1 files changed, 10 insertions, 1 deletions
diff --git a/tests/sqlalchemy/test_exc_filters.py b/tests/sqlalchemy/test_exc_filters.py
index 60dfe26..b6b1375 100644
--- a/tests/sqlalchemy/test_exc_filters.py
+++ b/tests/sqlalchemy/test_exc_filters.py
@@ -16,18 +16,20 @@ import contextlib
import itertools
import mock
+from oslotest import base as oslo_test_base
import six
import sqlalchemy as sqla
from sqlalchemy.orm import mapper
from oslo.db import exception
+from oslo.db.sqlalchemy import exc_filters
from oslo.db.sqlalchemy import session
from oslo.db.sqlalchemy import test_base
_TABLE_NAME = '__tmp__test__tmp__'
-class TestsExceptionFilter(test_base.DbTestCase):
+class TestsExceptionFilter(oslo_test_base.BaseTestCase):
class Error(Exception):
"""DBAPI base error.
@@ -61,6 +63,13 @@ class TestsExceptionFilter(test_base.DbTestCase):
"""
+ def setUp(self):
+ super(TestsExceptionFilter, self).setUp()
+ self.engine = sqla.create_engine("sqlite://")
+ exc_filters.register_engine(self.engine)
+ sqla.event.listen(self.engine, "begin", session._begin_ping_listener)
+ self.engine.connect().close() # initialize
+
@contextlib.contextmanager
def _dbapi_fixture(self, dialect_name):
engine = self.engine