Fixed #14550 -- fixed the behavior of commit_on_success to exit the transaction properly. This was a bug introduced in [14288]. Thanks to Justin for the report and Florian Apolloner for help debugging.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14343 bcc190cf-cafb-0310-a4f2-bffc1f526a37

2 files changed, 34 insertions, 0 deletions

diff --git a/tests/modeltests/transactions/tests.py b/tests/modeltests/transactions/tests.py
index 9deb18382c..00ceed584b 100644
--- a/tests/modeltests/transactions/tests.py
+++ b/tests/modeltests/transactions/tests.py
@@ -114,6 +114,25 @@ class TransactionTests(TransactionTestCase):
         self.assertEqual(list(Reporter.objects.all()), [])
 
     @skipUnlessDBFeature('supports_transactions')
+    def test_commit_on_success_exit(self):
+        @transaction.autocommit()
+        def gen_reporter():
+            @transaction.commit_on_success
+            def create_reporter():
+                Reporter.objects.create(first_name="Bobby", last_name="Tables")
+
+            create_reporter()
+            # Much more formal
+            r = Reporter.objects.get()
+            r.first_name = "Robert"
+            r.save()
+
+        gen_reporter()
+        r = Reporter.objects.get()
+        self.assertEqual(r.first_name, "Robert")
+
+
+    @skipUnlessDBFeature('supports_transactions')
     def test_manually_managed(self):
         """
         You can manually manage transactions if you really want to, but you
@@ -146,6 +165,7 @@ class TransactionTests(TransactionTestCase):
             using_manually_managed_mistake
         )
 
+
 class TransactionRollbackTests(TransactionTestCase):
     def execute_bad_sql(self):
         cursor = connection.cursor()
diff --git a/tests/modeltests/transactions/tests_25.py b/tests/modeltests/transactions/tests_25.py
index ec3c4d1215..cc2290edff 100644
--- a/tests/modeltests/transactions/tests_25.py
+++ b/tests/modeltests/transactions/tests_25.py
@@ -79,6 +79,20 @@ class TransactionContextManagerTests(TransactionTestCase):
         self.assertQuerysetEqual(Reporter.objects.all(), [])
 
     @skipUnlessDBFeature('supports_transactions')
+    def test_commit_on_success_exit(self):
+        with transaction.autocommit():
+            with transaction.commit_on_success():
+                Reporter.objects.create(first_name="Bobby", last_name="Tables")
+
+            # Much more formal
+            r = Reporter.objects.get()
+            r.first_name = "Robert"
+            r.save()
+
+        r = Reporter.objects.get()
+        self.assertEqual(r.first_name, "Robert")
+
+    @skipUnlessDBFeature('supports_transactions')
     def test_manually_managed(self):
         """
         You can manually manage transactions if you really want to, but you