Skip to content

Commit 01cd091

Browse files
xordoquyxordoquy
authored
Merge pull request encode#4721 from auvipy/pytest6
converted asserts of atomic requests and decorators tests to pytest
2 parents e03d88c + a9b6c97 commit 01cd091

File tree

2 files changed

+20
-24
lines changed

2 files changed

+20
-24
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

‎tests/test_decorators.py

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@ def view(request):
5656

5757
request = self.factory.get('/')
5858
response = view(request)
59-
self.assertEqual(response.status_code, status.HTTP_200_OK)
59+
assert response.status_code == status.HTTP_200_OK
6060

6161
request = self.factory.post('/')
6262
response = view(request)
63-
self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
63+
assert response.status_code == status.HTTP_405_METHOD_NOT_ALLOWED
6464

6565
def test_calling_put_method(self):
6666

@@ -70,11 +70,11 @@ def view(request):
7070

7171
request = self.factory.put('/')
7272
response = view(request)
73-
self.assertEqual(response.status_code, status.HTTP_200_OK)
73+
assert response.status_code == status.HTTP_200_OK
7474

7575
request = self.factory.post('/')
7676
response = view(request)
77-
self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
77+
assert response.status_code == status.HTTP_405_METHOD_NOT_ALLOWED
7878

7979
def test_calling_patch_method(self):
8080

@@ -84,11 +84,11 @@ def view(request):
8484

8585
request = self.factory.patch('/')
8686
response = view(request)
87-
self.assertEqual(response.status_code, status.HTTP_200_OK)
87+
assert response.status_code == status.HTTP_200_OK
8888

8989
request = self.factory.post('/')
9090
response = view(request)
91-
self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
91+
assert response.status_code == status.HTTP_405_METHOD_NOT_ALLOWED
9292

9393
def test_renderer_classes(self):
9494

@@ -99,16 +99,15 @@ def view(request):
9999

100100
request = self.factory.get('/')
101101
response = view(request)
102-
self.assertTrue(isinstance(response.accepted_renderer, JSONRenderer))
102+
assert isinstance(response.accepted_renderer, JSONRenderer)
103103

104104
def test_parser_classes(self):
105105

106106
@api_view(['GET'])
107107
@parser_classes([JSONParser])
108108
def view(request):
109-
self.assertEqual(len(request.parsers), 1)
110-
self.assertTrue(isinstance(request.parsers[0],
111-
JSONParser))
109+
assert len(request.parsers) == 1
110+
assert isinstance(request.parsers[0], JSONParser)
112111
return Response({})
113112

114113
request = self.factory.get('/')
@@ -119,9 +118,8 @@ def test_authentication_classes(self):
119118
@api_view(['GET'])
120119
@authentication_classes([BasicAuthentication])
121120
def view(request):
122-
self.assertEqual(len(request.authenticators), 1)
123-
self.assertTrue(isinstance(request.authenticators[0],
124-
BasicAuthentication))
121+
assert len(request.authenticators) == 1
122+
assert isinstance(request.authenticators[0], BasicAuthentication)
125123
return Response({})
126124

127125
request = self.factory.get('/')
@@ -136,7 +134,7 @@ def view(request):
136134

137135
request = self.factory.get('/')
138136
response = view(request)
139-
self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
137+
assert response.status_code == status.HTTP_403_FORBIDDEN
140138

141139
def test_throttle_classes(self):
142140
class OncePerDayUserThrottle(UserRateThrottle):
@@ -149,7 +147,7 @@ def view(request):
149147

150148
request = self.factory.get('/')
151149
response = view(request)
152-
self.assertEqual(response.status_code, status.HTTP_200_OK)
150+
assert response.status_code == status.HTTP_200_OK
153151

154152
response = view(request)
155-
self.assertEqual(response.status_code, status.HTTP_429_TOO_MANY_REQUESTS)
153+
assert response.status_code == status.HTTP_429_TOO_MANY_REQUESTS

0 commit comments

Comments
 (0)