diff options
author | Jon Dufresne <jon.dufresne@gmail.com> | 2016-06-16 11:19:18 -0700 |
---|---|---|
committer | Tim Graham <timograham@gmail.com> | 2016-06-16 14:19:18 -0400 |
commit | 4f336f66523001b009ab038b10848508fd208b3b (patch) | |
tree | 47474fb588013f1770246455ef7aa1a4163a1edb /tests/middleware | |
parent | ea34426ae789d31b036f58c8fd59ce299649e91e (diff) | |
download | django-4f336f66523001b009ab038b10848508fd208b3b.tar.gz |
Fixed #26747 -- Used more specific assertions in the Django test suite.
Diffstat (limited to 'tests/middleware')
-rw-r--r-- | tests/middleware/test_security.py | 6 | ||||
-rw-r--r-- | tests/middleware/tests.py | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/tests/middleware/test_security.py b/tests/middleware/test_security.py index 6a60473d57..d42ae9b264 100644 --- a/tests/middleware/test_security.py +++ b/tests/middleware/test_security.py @@ -168,7 +168,7 @@ class SecurityMiddlewareTest(SimpleTestCase): The middleware does not redirect secure requests. """ ret = self.process_request("get", "/some/url", secure=True) - self.assertEqual(ret, None) + self.assertIsNone(ret) @override_settings( SECURE_SSL_REDIRECT=True, SECURE_REDIRECT_EXEMPT=["^insecure/"]) @@ -178,7 +178,7 @@ class SecurityMiddlewareTest(SimpleTestCase): exempt pattern. """ ret = self.process_request("get", "/insecure/page") - self.assertEqual(ret, None) + self.assertIsNone(ret) @override_settings( SECURE_SSL_REDIRECT=True, SECURE_SSL_HOST="secure.example.com") @@ -196,4 +196,4 @@ class SecurityMiddlewareTest(SimpleTestCase): With SSL_REDIRECT False, the middleware does no redirect. """ ret = self.process_request("get", "/some/url") - self.assertEqual(ret, None) + self.assertIsNone(ret) diff --git a/tests/middleware/tests.py b/tests/middleware/tests.py index 2f88f94780..f87bb9d71c 100644 --- a/tests/middleware/tests.py +++ b/tests/middleware/tests.py @@ -38,7 +38,7 @@ class CommonMiddlewareTest(SimpleTestCase): URLs with slashes should go unmolested. """ request = self.rf.get('/slash/') - self.assertEqual(CommonMiddleware().process_request(request), None) + self.assertIsNone(CommonMiddleware().process_request(request)) response = HttpResponseNotFound() self.assertEqual(CommonMiddleware().process_response(request, response), response) @@ -48,7 +48,7 @@ class CommonMiddlewareTest(SimpleTestCase): Matches to explicit slashless URLs should go unmolested. """ request = self.rf.get('/noslash') - self.assertEqual(CommonMiddleware().process_request(request), None) + self.assertIsNone(CommonMiddleware().process_request(request)) response = HttpResponse("Here's the text of the Web page.") self.assertEqual(CommonMiddleware().process_response(request, response), response) @@ -153,7 +153,7 @@ class CommonMiddlewareTest(SimpleTestCase): """ request = self.rf.get('/customurlconf/slash/') request.urlconf = 'middleware.extra_urls' - self.assertEqual(CommonMiddleware().process_request(request), None) + self.assertIsNone(CommonMiddleware().process_request(request)) response = HttpResponseNotFound() self.assertEqual(CommonMiddleware().process_response(request, response), response) @@ -164,7 +164,7 @@ class CommonMiddlewareTest(SimpleTestCase): """ request = self.rf.get('/customurlconf/noslash') request.urlconf = 'middleware.extra_urls' - self.assertEqual(CommonMiddleware().process_request(request), None) + self.assertIsNone(CommonMiddleware().process_request(request)) response = HttpResponse("Here's the text of the Web page.") self.assertEqual(CommonMiddleware().process_response(request, response), response) @@ -175,7 +175,7 @@ class CommonMiddlewareTest(SimpleTestCase): """ request = self.rf.get('/customurlconf/unknown') request.urlconf = 'middleware.extra_urls' - self.assertEqual(CommonMiddleware().process_request(request), None) + self.assertIsNone(CommonMiddleware().process_request(request)) response = HttpResponseNotFound() self.assertEqual(CommonMiddleware().process_response(request, response), response) @@ -213,7 +213,7 @@ class CommonMiddlewareTest(SimpleTestCase): """ request = self.rf.get('/customurlconf/slash') request.urlconf = 'middleware.extra_urls' - self.assertEqual(CommonMiddleware().process_request(request), None) + self.assertIsNone(CommonMiddleware().process_request(request)) response = HttpResponseNotFound() self.assertEqual(CommonMiddleware().process_response(request, response), response) |