diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-08-06 14:45:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-08-06 14:45:17 +0000 |
| commit | 036c9b4eefa5edb47cee63b6407b7ea3f9776576 (patch) | |
| tree | d0e77900bf8e00e94cd4184859f6a7bc389264fa | |
| parent | 4c18fca18e3cd0708b12c9d00897373cb36c3ea9 (diff) | |
| parent | 584a8834889f7f5fac4b598e63bbcc8e1dd53abe (diff) | |
| download | oslo-db-036c9b4eefa5edb47cee63b6407b7ea3f9776576.tar.gz | |
Merge "Fixed DeprecationWarning in exc_filters"
| -rw-r--r-- | oslo/db/sqlalchemy/exc_filters.py | 2 | ||||
| -rw-r--r-- | tests/sqlalchemy/test_exc_filters.py | 12 | ||||
| -rw-r--r-- | tests/sqlalchemy/test_handle_error.py | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/oslo/db/sqlalchemy/exc_filters.py b/oslo/db/sqlalchemy/exc_filters.py index 7b0b0c9..e32e9c4 100644 --- a/oslo/db/sqlalchemy/exc_filters.py +++ b/oslo/db/sqlalchemy/exc_filters.py @@ -313,7 +313,7 @@ def handler(context): if super_ in per_dialect: regexp_reg = per_dialect[super_] for fn, regexp in regexp_reg: - match = regexp.match(exc.message) + match = regexp.match(exc.args[0]) if match: try: fn( diff --git a/tests/sqlalchemy/test_exc_filters.py b/tests/sqlalchemy/test_exc_filters.py index 0f14cbb..60dfe26 100644 --- a/tests/sqlalchemy/test_exc_filters.py +++ b/tests/sqlalchemy/test_exc_filters.py @@ -120,7 +120,7 @@ class TestFallthroughsAndNonDBAPI(TestsExceptionFilter): self.assertEqual( "(ProgrammingError) Error 123, you made a " "mistake 'select you_made_a_programming_error' ()", - matched.message) + matched.args[0]) def test_generic_dbapi_disconnect(self): matched = self._run_test( @@ -132,7 +132,7 @@ class TestFallthroughsAndNonDBAPI(TestsExceptionFilter): self.assertEqual( "(InterfaceError) connection lost " "'select the_db_disconnected' ()", - matched.message) + matched.args[0]) def test_operational_dbapi_disconnect(self): matched = self._run_test( @@ -144,7 +144,7 @@ class TestFallthroughsAndNonDBAPI(TestsExceptionFilter): self.assertEqual( "(OperationalError) connection lost " "'select the_db_disconnected' ()", - matched.message) + matched.args[0]) def test_operational_error_asis(self): """Test operational errors. @@ -160,7 +160,7 @@ class TestFallthroughsAndNonDBAPI(TestsExceptionFilter): ) self.assertEqual( "(OperationalError) some op error", - matched.message) + matched.args[0]) def test_unicode_encode(self): # intentionally generate a UnicodeEncodeError, as its @@ -183,7 +183,7 @@ class TestFallthroughsAndNonDBAPI(TestsExceptionFilter): AttributeError("mysqldb has an attribute error"), exception.DBError ) - self.assertEqual("mysqldb has an attribute error", matched.message) + self.assertEqual("mysqldb has an attribute error", matched.args[0]) class TestRaiseReferenceError(TestsExceptionFilter): @@ -289,7 +289,7 @@ class TestDuplicate(TestsExceptionFilter): self.IntegrityError(message), expected_cls ) - self.assertEqual(expected_message, matched.message) + self.assertEqual(expected_message, matched.args[0]) def test_sqlite(self): self._run_dupe_constraint_test("sqlite", 'column a, b are not unique') diff --git a/tests/sqlalchemy/test_handle_error.py b/tests/sqlalchemy/test_handle_error.py index 2bdb6b0..6ebcd28 100644 --- a/tests/sqlalchemy/test_handle_error.py +++ b/tests/sqlalchemy/test_handle_error.py @@ -62,7 +62,7 @@ class ExceptionReraiseTest(test_base.BaseTestCase): self.engine.execute, "SELECT 'ERROR ONE' FROM I_DONT_EXIST" ) self.assertEqual(1, patched.call_count) - self.assertEqual("my exception", matchee.message) + self.assertEqual("my exception", matchee.args[0]) def test_exception_event_non_altered(self): self._fixture() |