Merge pull request #3016 from hellysmile/non_atomic_requests

Fix set_rollback on @transaction.non_atomic_requests.

rest_framework/compat.py

@@ -274,7 +274,8 @@ def set_rollback():
         if connection.settings_dict.get('ATOMIC_REQUESTS', False):
             # If running in >=1.6 then mark a rollback as required,
             # and allow it to be handled by Django.
-            transaction.set_rollback(True)
+            if connection.in_atomic_block:
+                transaction.set_rollback(True)
     elif transaction.is_managed():
         # Otherwise handle it explicitly if in managed mode.
         if transaction.is_dirty():

tests/test_atomic_requests.py

 from __future__ import unicode_literals
 
+from django.conf.urls import patterns, url
 from django.db import connection, connections, transaction
-from django.test import TestCase
+from django.test import TestCase, TransactionTestCase
+from django.http import Http404
+from django.utils.decorators import method_decorator
 from django.utils.unittest import skipUnless
 from rest_framework import status
 from rest_framework.exceptions import APIException
@@ -108,3 +111,37 @@ class DBTransactionAPIExceptionTests(TestCase):
         self.assertEqual(response.status_code,
                          status.HTTP_500_INTERNAL_SERVER_ERROR)
         assert BasicModel.objects.count() == 0
+
+
+@skipUnless(connection.features.uses_savepoints,
+            "'atomic' requires transactions and savepoints.")
+class NonAtomicDBTransactionAPIExceptionTests(TransactionTestCase):
+    @property
+    def urls(self):
+        class NonAtomicAPIExceptionView(APIView):
+            @method_decorator(transaction.non_atomic_requests)
+            def dispatch(self, *args, **kwargs):
+                return super(NonAtomicAPIExceptionView, self).dispatch(*args, **kwargs)
+
+            def get(self, request, *args, **kwargs):
+                BasicModel.objects.all()
+                raise Http404
+
+        return patterns(
+            '',
+            url(r'^$', NonAtomicAPIExceptionView.as_view())
+        )
+
+    def setUp(self):
+        connections.databases['default']['ATOMIC_REQUESTS'] = True
+
+    def tearDown(self):
+        connections.databases['default']['ATOMIC_REQUESTS'] = False
+
+    def test_api_exception_rollback_transaction_non_atomic_view(self):
+        response = self.client.get('/')
+
+        # without checking connection.in_atomic_block view raises 500
+        # due attempt to rollback without transaction
+        self.assertEqual(response.status_code,
+                         status.HTTP_404_NOT_FOUND)