Merge pull request #4808 from micgeronimo/pytest-cleanup

Refactor some tests to pytest style

tests/test_request.py

@@ -42,14 +42,14 @@ class TestContentParsing(TestCase):
         Ensure request.data returns empty QueryDict for GET request.
         """
         request = Request(factory.get('/'))
-        self.assertEqual(request.data, {})
+        assert request.data == {}
 
     def test_standard_behaviour_determines_no_content_HEAD(self):
         """
         Ensure request.data returns empty QueryDict for HEAD request.
         """
         request = Request(factory.head('/'))
-        self.assertEqual(request.data, {})
+        assert request.data == {}
 
     def test_request_DATA_with_form_content(self):
         """
@@ -58,7 +58,7 @@ class TestContentParsing(TestCase):
         data = {'qwerty': 'uiop'}
         request = Request(factory.post('/', data))
         request.parsers = (FormParser(), MultiPartParser())
-        self.assertEqual(list(request.data.items()), list(data.items()))
+        assert list(request.data.items()) == list(data.items())
 
     def test_request_DATA_with_text_content(self):
         """
@@ -69,7 +69,7 @@ class TestContentParsing(TestCase):
         content_type = 'text/plain'
         request = Request(factory.post('/', content, content_type=content_type))
         request.parsers = (PlainTextParser(),)
-        self.assertEqual(request.data, content)
+        assert request.data == content
 
     def test_request_POST_with_form_content(self):
         """
@@ -78,7 +78,7 @@ class TestContentParsing(TestCase):
         data = {'qwerty': 'uiop'}
         request = Request(factory.post('/', data))
         request.parsers = (FormParser(), MultiPartParser())
-        self.assertEqual(list(request.POST.items()), list(data.items()))
+        assert list(request.POST.items()) == list(data.items())
 
     def test_request_POST_with_files(self):
         """
@@ -87,8 +87,8 @@ class TestContentParsing(TestCase):
         upload = SimpleUploadedFile("file.txt", b"file_content")
         request = Request(factory.post('/', {'upload': upload}))
         request.parsers = (FormParser(), MultiPartParser())
-        self.assertEqual(list(request.POST.keys()), [])
-        self.assertEqual(list(request.FILES.keys()), ['upload'])
+        assert list(request.POST.keys()) == []
+        assert list(request.FILES.keys()) == ['upload']
 
     def test_standard_behaviour_determines_form_content_PUT(self):
         """
@@ -97,7 +97,7 @@ class TestContentParsing(TestCase):
         data = {'qwerty': 'uiop'}
         request = Request(factory.put('/', data))
         request.parsers = (FormParser(), MultiPartParser())
-        self.assertEqual(list(request.data.items()), list(data.items()))
+        assert list(request.data.items()) == list(data.items())
 
     def test_standard_behaviour_determines_non_form_content_PUT(self):
         """
@@ -108,7 +108,7 @@ class TestContentParsing(TestCase):
         content_type = 'text/plain'
         request = Request(factory.put('/', content, content_type=content_type))
         request.parsers = (PlainTextParser(), )
-        self.assertEqual(request.data, content)
+        assert request.data == content
 
 
 class MockView(APIView):
@@ -142,10 +142,10 @@ class TestContentParsingWithAuthentication(TestCase):
         content = {'example': 'example'}
 
         response = self.client.post('/', content)
-        self.assertEqual(status.HTTP_200_OK, response.status_code)
+        assert status.HTTP_200_OK == response.status_code
 
         response = self.csrf_client.post('/', content)
-        self.assertEqual(status.HTTP_200_OK, response.status_code)
+        assert status.HTTP_200_OK == response.status_code
 
 
 class TestUserSetter(TestCase):
@@ -162,11 +162,11 @@ class TestUserSetter(TestCase):
 
     def test_user_can_be_set(self):
         self.request.user = self.user
-        self.assertEqual(self.request.user, self.user)
+        assert self.request.user == self.user
 
     def test_user_can_login(self):
         login(self.request, self.user)
-        self.assertEqual(self.request.user, self.user)
+        assert self.request.user == self.user
 
     def test_user_can_logout(self):
         self.request.user = self.user
@@ -176,7 +176,7 @@ class TestUserSetter(TestCase):
 
     def test_logged_in_user_is_set_on_wrapped_request(self):
         login(self.request, self.user)
-        self.assertEqual(self.wrapped_request.user, self.user)
+        assert self.wrapped_request.user == self.user
 
     def test_calling_user_fails_when_attribute_error_is_raised(self):
         """
@@ -207,15 +207,15 @@ class TestAuthSetter(TestCase):
     def test_auth_can_be_set(self):
         request = Request(factory.get('/'))
         request.auth = 'DUMMY'
-        self.assertEqual(request.auth, 'DUMMY')
+        assert request.auth == 'DUMMY'
 
 
 class TestSecure(TestCase):
 
     def test_default_secure_false(self):
         request = Request(factory.get('/', secure=False))
-        self.assertEqual(request.scheme, 'http')
+        assert request.scheme == 'http'
 
     def test_default_secure_true(self):
         request = Request(factory.get('/', secure=True))
-        self.assertEqual(request.scheme, 'https')
+        assert request.scheme == 'https'

tests/test_reverse.py

@@ -38,18 +38,18 @@ class ReverseTests(TestCase):
     def test_reversed_urls_are_fully_qualified(self):
         request = factory.get('/view')
         url = reverse('view', request=request)
-        self.assertEqual(url, 'http://testserver/view')
+        assert url == 'http://testserver/view'
 
     def test_reverse_with_versioning_scheme(self):
         request = factory.get('/view')
         request.versioning_scheme = MockVersioningScheme()
 
         url = reverse('view', request=request)
-        self.assertEqual(url, 'http://scheme-reversed/view')
+        assert url == 'http://scheme-reversed/view'
 
     def test_reverse_with_versioning_scheme_fallback_to_default_on_error(self):
         request = factory.get('/view')
         request.versioning_scheme = MockVersioningScheme(raise_error=True)
 
         url = reverse('view', request=request)
-        self.assertEqual(url, 'http://testserver/view')
+        assert url == 'http://testserver/view'

tests/test_schemas.py

@@ -90,7 +90,7 @@ class TestRouterGeneratedSchema(TestCase):
     def test_anonymous_request(self):
         client = APIClient()
         response = client.get('/', HTTP_ACCEPT='application/coreapi+json')
-        self.assertEqual(response.status_code, 200)
+        assert response.status_code == 200
         expected = coreapi.Document(
             url='',
             title='Example API',
@@ -125,13 +125,13 @@ class TestRouterGeneratedSchema(TestCase):
                 }
             }
         )
-        self.assertEqual(response.data, expected)
+        assert response.data == expected
 
     def test_authenticated_request(self):
         client = APIClient()
         client.force_authenticate(MockUser())
         response = client.get('/', HTTP_ACCEPT='application/coreapi+json')
-        self.assertEqual(response.status_code, 200)
+        assert response.status_code == 200
         expected = coreapi.Document(
             url='',
             title='Example API',
@@ -217,7 +217,7 @@ class TestRouterGeneratedSchema(TestCase):
                 }
             }
         )
-        self.assertEqual(response.data, expected)
+        assert response.data == expected
 
 
 class DenyAllUsingHttp404(permissions.BasePermission):
@@ -312,7 +312,7 @@ class TestSchemaGenerator(TestCase):
                 }
             }
         )
-        self.assertEqual(schema, expected)
+        assert schema == expected
 
 
 @unittest.skipUnless(coreapi, 'coreapi is not installed')
@@ -365,7 +365,7 @@ class TestSchemaGeneratorNotAtRoot(TestCase):
                 }
             }
         )
-        self.assertEqual(schema, expected)
+        assert schema == expected
 
 
 @unittest.skipUnless(coreapi, 'coreapi is not installed')
@@ -400,7 +400,7 @@ class TestSchemaGeneratorWithRestrictedViewSets(TestCase):
                 },
             }
         )
-        self.assertEqual(schema, expected)
+        assert schema == expected
 
 
 @unittest.skipUnless(coreapi, 'coreapi is not installed')