- Non-DBAPI errors which occur in the scope of an `execute()`

call are now wrapped in sqlalchemy.exc.StatementError,
and the text of the SQL statement and repr() of params
is included.  This makes it easier to identify statement
executions which fail before the DBAPI becomes
involved.  [ticket:2015]

1 files changed, 12 insertions, 15 deletions

diff --git a/test/engine/test_reconnect.py b/test/engine/test_reconnect.py
index 9b3a1b4db..74986c178 100644
--- a/test/engine/test_reconnect.py
+++ b/test/engine/test_reconnect.py
@@ -1,4 +1,4 @@
-from test.lib.testing import eq_, assert_raises
+from test.lib.testing import eq_, assert_raises, assert_raises_message
 import time
 import weakref
 from sqlalchemy import select, MetaData, Integer, String, pool
@@ -130,13 +130,11 @@ class MockReconnectTest(TestBase):
         assert not conn.closed
         assert conn.invalidated
         assert trans.is_active
-        try:
-            conn.execute(select([1]))
-            assert False
-        except tsa.exc.InvalidRequestError, e:
-            assert str(e) \
-                == "Can't reconnect until invalid transaction is "\
-                "rolled back"
+        assert_raises_message(
+            tsa.exc.StatementError,
+            "Can't reconnect until invalid transaction is rolled back",
+            conn.execute, select([1])
+        )
         assert trans.is_active
         try:
             trans.commit()
@@ -364,13 +362,12 @@ class RealReconnectTest(TestBase):
         assert not conn.closed
         assert conn.invalidated
         assert trans.is_active
-        try:
-            conn.execute(select([1]))
-            assert False
-        except tsa.exc.InvalidRequestError, e:
-            assert str(e) \
-                == "Can't reconnect until invalid transaction is "\
-                "rolled back"
+        assert_raises_message(
+            tsa.exc.StatementError,
+            "Can't reconnect until invalid transaction is "\
+                "rolled back",
+            conn.execute, select([1])
+        )
         assert trans.is_active
         try:
             trans.commit()