Skip to content

Fix set_rollback on @transaction.non_atomic_requests. #3016

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xordoquy merged 3 commits into from
Jun 8, 2015
Merged

Fix set_rollback on @transaction.non_atomic_requests. #3016

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c292b3d
Fix set_rollback on @transaction.non_atomic_requests.
hellysmile Jun 8, 2015
b015ae9
Inline @transaction.non_atomic_requests for Django<1.6.
hellysmile Jun 8, 2015
cbfce93
Fitx TestCase due Django interals.
hellysmile Jun 8, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Inline @transaction.non_atomic_requests for Django<1.6.
  • Loading branch information
@hellysmile
hellysmile committed Jun 8, 2015
commit b015ae99e69c1bf8525a6163008a7a760b22c5bf
20 changes: 10 additions & 10 deletions tests/test_atomic_requests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,6 @@ def post(self, request, *args, **kwargs):
raise APIException


class NonAtomicAPIExceptionView(APIView):
@method_decorator(transaction.non_atomic_requests)
def dispatch(self, *args, **kwargs):
return super(NonAtomicAPIExceptionView, self).dispatch(*args, **kwargs)

def post(self, request, *args, **kwargs):
BasicModel.objects.create()
raise PermissionDenied


@skipUnless(connection.features.uses_savepoints,
"'atomic' requires transactions and savepoints.")
class DBTransactionTests(TestCase):
Expand Down Expand Up @@ -125,6 +115,16 @@ def test_api_exception_rollback_transaction(self):
"'atomic' requires transactions and savepoints.")
class NonAtomicDBTransactionAPIExceptionTests(TestCase):
def setUp(self):
# only Django >= 1.6 provides @transaction.non_atomic_requests
class NonAtomicAPIExceptionView(APIView):
@method_decorator(transaction.non_atomic_requests)
def dispatch(self, *args, **kwargs):
return super(NonAtomicAPIExceptionView, self).dispatch(*args, **kwargs)

def post(self, request, *args, **kwargs):
BasicModel.objects.create()
raise PermissionDenied

self.view = NonAtomicAPIExceptionView.as_view()
connections.databases['default']['ATOMIC_REQUESTS'] = True

Expand Down