- revert the change first made in a6fe4dc, as we are now generalizing

the warning here to all safe_reraise() cases in Python 2.
- Revisiting :ticket:`2696`, first released in 1.0.10, which attempts to
work around Python 2's lack of exception context reporting by emitting
a warning for an exception that was interrupted by a second exception
when attempting to roll back the already-failed transaction; this
issue continues to occur for MySQL backends in conjunction with a
savepoint that gets unexpectedly lost, which then causes a
"no such savepoint" error when the rollback is attempted, obscuring
what the original condition was.

The approach has been generalized to the Core "safe
reraise" function which takes place across the ORM and Core in any
place that a transaction is being rolled back in response to an error
which occurred trying to commit, including the context managers
provided by :class:`.Session` and :class:`.Connection`, and taking
place for operations such as a failure on "RELEASE SAVEPOINT".
Previously, the fix was only in place for a specific path within
the ORM flush/commit process; it now takes place for all transational
context managers as well.
fixes #2696

1 files changed, 3 insertions, 3 deletions

diff --git a/test/orm/test_transaction.py b/test/orm/test_transaction.py
index 7efb5942b..c7b3315d9 100644
--- a/test/orm/test_transaction.py
+++ b/test/orm/test_transaction.py
@@ -657,8 +657,8 @@ class SessionTransactionTest(FixtureTest):
         assert session.transaction is not None, \
             'autocommit=False should start a new transaction'
 
-    @testing.skip_if("oracle", "oracle doesn't support release of savepoint")
-    @testing.requires.savepoints
+    @testing.requires.python2
+    @testing.requires.savepoints_w_release
     def test_report_primary_error_when_rollback_fails(self):
         User, users = self.classes.User, self.tables.users
 
@@ -666,7 +666,7 @@ class SessionTransactionTest(FixtureTest):
 
         session = Session(testing.db)
 
-        with expect_warnings(".*due to an additional ROLLBACK.*INSERT INTO"):
+        with expect_warnings(".*during handling of a previous exception.*"):
             session.begin_nested()
             savepoint = session.\
                 connection()._Connection__transaction._savepoint