diff options
| -rw-r--r-- | oslo_db/tests/old_import_api/sqlalchemy/test_exc_filters.py | 11 | ||||
| -rw-r--r-- | oslo_db/tests/sqlalchemy/test_exc_filters.py | 11 |
2 files changed, 16 insertions, 6 deletions
diff --git a/oslo_db/tests/old_import_api/sqlalchemy/test_exc_filters.py b/oslo_db/tests/old_import_api/sqlalchemy/test_exc_filters.py index 4d4609a..253ea89 100644 --- a/oslo_db/tests/old_import_api/sqlalchemy/test_exc_filters.py +++ b/oslo_db/tests/old_import_api/sqlalchemy/test_exc_filters.py @@ -48,9 +48,14 @@ class _SQLAExceptionMatcher(object): self.assertEqual(exc.__class__.__name__, exception_type) self.assertEqual(str(exc.orig).lower(), message.lower()) if sql is not None: - self.assertEqual(exc.statement, sql) - if params is not None: - self.assertEqual(exc.params, params) + if params is not None: + if '?' in exc.statement: + self.assertEqual(exc.statement, sql) + self.assertEqual(exc.params, params) + else: + self.assertEqual(exc.statement % exc.params, sql % params) + else: + self.assertEqual(exc.statement, sql) class TestsExceptionFilter(_SQLAExceptionMatcher, oslo_test_base.BaseTestCase): diff --git a/oslo_db/tests/sqlalchemy/test_exc_filters.py b/oslo_db/tests/sqlalchemy/test_exc_filters.py index aafdcfb..11d03d8 100644 --- a/oslo_db/tests/sqlalchemy/test_exc_filters.py +++ b/oslo_db/tests/sqlalchemy/test_exc_filters.py @@ -48,9 +48,14 @@ class _SQLAExceptionMatcher(object): self.assertEqual(exc.__class__.__name__, exception_type) self.assertEqual(str(exc.orig).lower(), message.lower()) if sql is not None: - self.assertEqual(exc.statement, sql) - if params is not None: - self.assertEqual(exc.params, params) + if params is not None: + if '?' in exc.statement: + self.assertEqual(exc.statement, sql) + self.assertEqual(exc.params, params) + else: + self.assertEqual(exc.statement % exc.params, sql % params) + else: + self.assertEqual(exc.statement, sql) class TestsExceptionFilter(_SQLAExceptionMatcher, oslo_test_base.BaseTestCase): |