diff options
Diffstat (limited to 'tests/regressiontests/middleware/tests.py')
| -rw-r--r-- | tests/regressiontests/middleware/tests.py | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/tests/regressiontests/middleware/tests.py b/tests/regressiontests/middleware/tests.py index 5d90ffc5dc..c364cb436e 100644 --- a/tests/regressiontests/middleware/tests.py +++ b/tests/regressiontests/middleware/tests.py @@ -31,7 +31,7 @@ class CommonMiddlewareTest(TestCase): """ settings.APPEND_SLASH = True request = self._get_request('slash/') - self.assertEquals(CommonMiddleware().process_request(request), None) + self.assertEqual(CommonMiddleware().process_request(request), None) def test_append_slash_slashless_resource(self): """ @@ -39,7 +39,7 @@ class CommonMiddlewareTest(TestCase): """ settings.APPEND_SLASH = True request = self._get_request('noslash') - self.assertEquals(CommonMiddleware().process_request(request), None) + self.assertEqual(CommonMiddleware().process_request(request), None) def test_append_slash_slashless_unknown(self): """ @@ -47,7 +47,7 @@ class CommonMiddlewareTest(TestCase): """ settings.APPEND_SLASH = True request = self._get_request('unknown') - self.assertEquals(CommonMiddleware().process_request(request), None) + self.assertEqual(CommonMiddleware().process_request(request), None) def test_append_slash_redirect(self): """ @@ -56,8 +56,8 @@ class CommonMiddlewareTest(TestCase): settings.APPEND_SLASH = True request = self._get_request('slash') r = CommonMiddleware().process_request(request) - self.assertEquals(r.status_code, 301) - self.assertEquals(r['Location'], 'http://testserver/middleware/slash/') + self.assertEqual(r.status_code, 301) + self.assertEqual(r['Location'], 'http://testserver/middleware/slash/') def test_append_slash_no_redirect_on_POST_in_DEBUG(self): """ @@ -85,7 +85,7 @@ class CommonMiddlewareTest(TestCase): """ settings.APPEND_SLASH = False request = self._get_request('slash') - self.assertEquals(CommonMiddleware().process_request(request), None) + self.assertEqual(CommonMiddleware().process_request(request), None) def test_append_slash_quoted(self): """ @@ -95,8 +95,8 @@ class CommonMiddlewareTest(TestCase): settings.APPEND_SLASH = True request = self._get_request('needsquoting#') r = CommonMiddleware().process_request(request) - self.assertEquals(r.status_code, 301) - self.assertEquals( + self.assertEqual(r.status_code, 301) + self.assertEqual( r['Location'], 'http://testserver/middleware/needsquoting%23/') @@ -105,8 +105,8 @@ class CommonMiddlewareTest(TestCase): settings.APPEND_SLASH = False request = self._get_request('path/') r = CommonMiddleware().process_request(request) - self.assertEquals(r.status_code, 301) - self.assertEquals( + self.assertEqual(r.status_code, 301) + self.assertEqual( r['Location'], 'http://www.testserver/middleware/path/') @@ -115,8 +115,8 @@ class CommonMiddlewareTest(TestCase): settings.APPEND_SLASH = True request = self._get_request('slash/') r = CommonMiddleware().process_request(request) - self.assertEquals(r.status_code, 301) - self.assertEquals(r['Location'], + self.assertEqual(r.status_code, 301) + self.assertEqual(r['Location'], 'http://www.testserver/middleware/slash/') def test_prepend_www_append_slash_slashless(self): @@ -124,8 +124,8 @@ class CommonMiddlewareTest(TestCase): settings.APPEND_SLASH = True request = self._get_request('slash') r = CommonMiddleware().process_request(request) - self.assertEquals(r.status_code, 301) - self.assertEquals(r['Location'], + self.assertEqual(r.status_code, 301) + self.assertEqual(r['Location'], 'http://www.testserver/middleware/slash/') @@ -139,7 +139,7 @@ class CommonMiddlewareTest(TestCase): settings.APPEND_SLASH = True request = self._get_request('customurlconf/slash/') request.urlconf = 'regressiontests.middleware.extra_urls' - self.assertEquals(CommonMiddleware().process_request(request), None) + self.assertEqual(CommonMiddleware().process_request(request), None) def test_append_slash_slashless_resource_custom_urlconf(self): """ @@ -148,7 +148,7 @@ class CommonMiddlewareTest(TestCase): settings.APPEND_SLASH = True request = self._get_request('customurlconf/noslash') request.urlconf = 'regressiontests.middleware.extra_urls' - self.assertEquals(CommonMiddleware().process_request(request), None) + self.assertEqual(CommonMiddleware().process_request(request), None) def test_append_slash_slashless_unknown_custom_urlconf(self): """ @@ -157,7 +157,7 @@ class CommonMiddlewareTest(TestCase): settings.APPEND_SLASH = True request = self._get_request('customurlconf/unknown') request.urlconf = 'regressiontests.middleware.extra_urls' - self.assertEquals(CommonMiddleware().process_request(request), None) + self.assertEqual(CommonMiddleware().process_request(request), None) def test_append_slash_redirect_custom_urlconf(self): """ @@ -169,8 +169,8 @@ class CommonMiddlewareTest(TestCase): r = CommonMiddleware().process_request(request) self.assertFalse(r is None, "CommonMiddlware failed to return APPEND_SLASH redirect using request.urlconf") - self.assertEquals(r.status_code, 301) - self.assertEquals(r['Location'], 'http://testserver/middleware/customurlconf/slash/') + self.assertEqual(r.status_code, 301) + self.assertEqual(r['Location'], 'http://testserver/middleware/customurlconf/slash/') def test_append_slash_no_redirect_on_POST_in_DEBUG_custom_urlconf(self): """ @@ -200,7 +200,7 @@ class CommonMiddlewareTest(TestCase): settings.APPEND_SLASH = False request = self._get_request('customurlconf/slash') request.urlconf = 'regressiontests.middleware.extra_urls' - self.assertEquals(CommonMiddleware().process_request(request), None) + self.assertEqual(CommonMiddleware().process_request(request), None) def test_append_slash_quoted_custom_urlconf(self): """ @@ -213,8 +213,8 @@ class CommonMiddlewareTest(TestCase): r = CommonMiddleware().process_request(request) self.assertFalse(r is None, "CommonMiddlware failed to return APPEND_SLASH redirect using request.urlconf") - self.assertEquals(r.status_code, 301) - self.assertEquals( + self.assertEqual(r.status_code, 301) + self.assertEqual( r['Location'], 'http://testserver/middleware/customurlconf/needsquoting%23/') @@ -224,8 +224,8 @@ class CommonMiddlewareTest(TestCase): request = self._get_request('customurlconf/path/') request.urlconf = 'regressiontests.middleware.extra_urls' r = CommonMiddleware().process_request(request) - self.assertEquals(r.status_code, 301) - self.assertEquals( + self.assertEqual(r.status_code, 301) + self.assertEqual( r['Location'], 'http://www.testserver/middleware/customurlconf/path/') @@ -235,8 +235,8 @@ class CommonMiddlewareTest(TestCase): request = self._get_request('customurlconf/slash/') request.urlconf = 'regressiontests.middleware.extra_urls' r = CommonMiddleware().process_request(request) - self.assertEquals(r.status_code, 301) - self.assertEquals(r['Location'], + self.assertEqual(r.status_code, 301) + self.assertEqual(r['Location'], 'http://www.testserver/middleware/customurlconf/slash/') def test_prepend_www_append_slash_slashless_custom_urlconf(self): @@ -245,8 +245,8 @@ class CommonMiddlewareTest(TestCase): request = self._get_request('customurlconf/slash') request.urlconf = 'regressiontests.middleware.extra_urls' r = CommonMiddleware().process_request(request) - self.assertEquals(r.status_code, 301) - self.assertEquals(r['Location'], + self.assertEqual(r.status_code, 301) + self.assertEqual(r['Location'], 'http://www.testserver/middleware/customurlconf/slash/') class ConditionalGetMiddlewareTest(TestCase): @@ -287,50 +287,50 @@ class ConditionalGetMiddlewareTest(TestCase): def test_if_none_match_and_no_etag(self): self.req.META['HTTP_IF_NONE_MATCH'] = 'spam' self.resp = ConditionalGetMiddleware().process_response(self.req, self.resp) - self.assertEquals(self.resp.status_code, 200) + self.assertEqual(self.resp.status_code, 200) def test_no_if_none_match_and_etag(self): self.resp['ETag'] = 'eggs' self.resp = ConditionalGetMiddleware().process_response(self.req, self.resp) - self.assertEquals(self.resp.status_code, 200) + self.assertEqual(self.resp.status_code, 200) def test_if_none_match_and_same_etag(self): self.req.META['HTTP_IF_NONE_MATCH'] = self.resp['ETag'] = 'spam' self.resp = ConditionalGetMiddleware().process_response(self.req, self.resp) - self.assertEquals(self.resp.status_code, 304) + self.assertEqual(self.resp.status_code, 304) def test_if_none_match_and_different_etag(self): self.req.META['HTTP_IF_NONE_MATCH'] = 'spam' self.resp['ETag'] = 'eggs' self.resp = ConditionalGetMiddleware().process_response(self.req, self.resp) - self.assertEquals(self.resp.status_code, 200) + self.assertEqual(self.resp.status_code, 200) # Tests for the Last-Modified header def test_if_modified_since_and_no_last_modified(self): self.req.META['HTTP_IF_MODIFIED_SINCE'] = 'Sat, 12 Feb 2011 17:38:44 GMT' self.resp = ConditionalGetMiddleware().process_response(self.req, self.resp) - self.assertEquals(self.resp.status_code, 200) + self.assertEqual(self.resp.status_code, 200) def test_no_if_modified_since_and_last_modified(self): self.resp['Last-Modified'] = 'Sat, 12 Feb 2011 17:38:44 GMT' self.resp = ConditionalGetMiddleware().process_response(self.req, self.resp) - self.assertEquals(self.resp.status_code, 200) + self.assertEqual(self.resp.status_code, 200) def test_if_modified_since_and_same_last_modified(self): self.req.META['HTTP_IF_MODIFIED_SINCE'] = 'Sat, 12 Feb 2011 17:38:44 GMT' self.resp['Last-Modified'] = 'Sat, 12 Feb 2011 17:38:44 GMT' self.resp = ConditionalGetMiddleware().process_response(self.req, self.resp) - self.assertEquals(self.resp.status_code, 304) + self.assertEqual(self.resp.status_code, 304) def test_if_modified_since_and_last_modified_in_the_past(self): self.req.META['HTTP_IF_MODIFIED_SINCE'] = 'Sat, 12 Feb 2011 17:38:44 GMT' self.resp['Last-Modified'] = 'Sat, 12 Feb 2011 17:35:44 GMT' self.resp = ConditionalGetMiddleware().process_response(self.req, self.resp) - self.assertEquals(self.resp.status_code, 304) + self.assertEqual(self.resp.status_code, 304) def test_if_modified_since_and_last_modified_in_the_future(self): self.req.META['HTTP_IF_MODIFIED_SINCE'] = 'Sat, 12 Feb 2011 17:38:44 GMT' self.resp['Last-Modified'] = 'Sat, 12 Feb 2011 17:41:44 GMT' self.resp = ConditionalGetMiddleware().process_response(self.req, self.resp) - self.assertEquals(self.resp.status_code, 200) + self.assertEqual(self.resp.status_code, 200) |