openstack/oslo.db
Code Issues Proposed changes

Merge "Adjust SAVEPOINT cause test for SQLA 1.1"

Browse Source
This commit is contained in:
Jenkins 2016-11-20 21:06:40 +00:00 committed by Gerrit Code Review
commit de9f89b60c
2 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
oslo_db/sqlalchemy/compat/utils.py
View File

@ -19,6 +19,7 @@ SQLA_VERSION = tuple(
for num in sqlalchemy.__version__.split(".")
)
sqla_110 = SQLA_VERSION >= (1, 1, 0)
sqla_100 = SQLA_VERSION >= (1, 0, 0)
sqla_097 = SQLA_VERSION >= (0, 9, 7)
sqla_094 = SQLA_VERSION >= (0, 9, 4)

41
oslo_db/tests/sqlalchemy/test_exc_filters.py
View File

@ -28,6 +28,7 @@ from sqlalchemy.ext.declarative import declarative_base
from sqlalchemy.orm import mapper
from oslo_db import exception
from oslo_db.sqlalchemy.compat import utils as compat_utils
from oslo_db.sqlalchemy import engines
from oslo_db.sqlalchemy import exc_filters
from oslo_db.tests.sqlalchemy import base as test_base
@ -666,22 +667,36 @@ class TestExceptionCauseMySQLSavepoint(test_base.MySQLOpportunisticTestCase):
# from the "with session.begin_nested()"
except exception.DBError as dbe_inner:
# first "cause" is the failed SAVEPOINT rollback
# from inside of flush(), when it fails
self.assertTrue(
isinstance(
dbe_inner.cause,
exception.DBError
if not compat_utils.sqla_110:
# first "cause" is the failed SAVEPOINT rollback
# from inside of flush(), when it fails
self.assertTrue(
isinstance(
dbe_inner.cause,
exception.DBError
)
)
)
# second "cause" is then the actual DB duplicate
self.assertTrue(
isinstance(
dbe_inner.cause.cause,
exception.DBDuplicateEntry
# second "cause" is then the actual DB duplicate
self.assertTrue(
isinstance(
dbe_inner.cause.cause,
exception.DBDuplicateEntry
)
)
)
else:
# in SQLA 1.1, the rollback() method of Session
# catches the error and repairs the state of the
# session even though the SAVEPOINT was lost;
# the net result here is that one exception is thrown
# instead of two. This is SQLAlchemy ticket #3680
self.assertTrue(
isinstance(
dbe_inner.cause,
exception.DBDuplicateEntry
)
)
except exception.DBError as dbe_outer:
self.assertTrue(
isinstance(