Skip to content

Commit 504f4b4

Browse files
committed
converted asserts of atomic requests test to pytest
1 parent e03d88c commit 504f4b4

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

tests/test_atomic_requests.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ def test_no_exception_commit_transaction(self):
6767

6868
with self.assertNumQueries(1):
6969
response = self.view(request)
70-
self.assertFalse(transaction.get_rollback())
71-
self.assertEqual(response.status_code, status.HTTP_200_OK)
70+
assert not transaction.get_rollback()
71+
assert response.status_code == status.HTTP_200_OK
7272
assert BasicModel.objects.count() == 1
7373

7474

@@ -98,7 +98,7 @@ def test_generic_exception_delegate_transaction_management(self):
9898
# 3 - release savepoint
9999
with transaction.atomic():
100100
self.assertRaises(Exception, self.view, request)
101-
self.assertFalse(transaction.get_rollback())
101+
assert not transaction.get_rollback()
102102
assert BasicModel.objects.count() == 1
103103

104104

@@ -128,9 +128,8 @@ def test_api_exception_rollback_transaction(self):
128128
# 4 - release savepoint (django>=1.8 only)
129129
with transaction.atomic():
130130
response = self.view(request)
131-
self.assertTrue(transaction.get_rollback())
132-
self.assertEqual(response.status_code,
133-
status.HTTP_500_INTERNAL_SERVER_ERROR)
131+
assert transaction.get_rollback()
132+
assert response.status_code == status.HTTP_500_INTERNAL_SERVER_ERROR
134133
assert BasicModel.objects.count() == 0
135134

136135

@@ -151,5 +150,4 @@ def test_api_exception_rollback_transaction_non_atomic_view(self):
151150

152151
# without checking connection.in_atomic_block view raises 500
153152
# due attempt to rollback without transaction
154-
self.assertEqual(response.status_code,
155-
status.HTTP_404_NOT_FOUND)
153+
assert response.status_code == status.HTTP_404_NOT_FOUND

0 commit comments

Comments
 (0)