Fixed #23074 -- Avoided leaking savepoints in atomic.

Thanks Chow Loong Jin for the report and the initial patch.

1 files changed, 22 insertions, 0 deletions

diff --git a/tests/transactions/tests.py b/tests/transactions/tests.py
index 72e600d41d..005df0ba91 100644
--- a/tests/transactions/tests.py
+++ b/tests/transactions/tests.py
@@ -403,3 +403,25 @@ class AtomicMiscTests(TransactionTestCase):
                 pass
         # Must not raise an exception
         transaction.atomic(Callable())
+
+    @skipUnlessDBFeature('can_release_savepoints')
+    def test_atomic_does_not_leak_savepoints_on_failure(self):
+        # Regression test for #23074
+
+        # Expect an error when rolling back a savepoint that doesn't exist.
+        # Done outside of the transaction block to ensure proper recovery.
+        with self.assertRaises(Error):
+
+            # Start a plain transaction.
+            with transaction.atomic():
+
+                # Swallow the intentional error raised in the sub-transaction.
+                with six.assertRaisesRegex(self, Exception, "Oops"):
+
+                    # Start a sub-transaction with a savepoint.
+                    with transaction.atomic():
+                        sid = connection.savepoint_ids[-1]
+                        raise Exception("Oops")
+
+                # This is expected to fail because the savepoint no longer exists.
+                connection.savepoint_rollback(sid)