diff options
Diffstat (limited to 'tests/conditional_processing/tests.py')
| -rw-r--r-- | tests/conditional_processing/tests.py | 71 |
1 files changed, 49 insertions, 22 deletions
diff --git a/tests/conditional_processing/tests.py b/tests/conditional_processing/tests.py index 3a67817683..2faacbf6e2 100644 --- a/tests/conditional_processing/tests.py +++ b/tests/conditional_processing/tests.py @@ -11,8 +11,8 @@ LAST_MODIFIED_STR = 'Sun, 21 Oct 2007 23:21:47 GMT' LAST_MODIFIED_NEWER_STR = 'Mon, 18 Oct 2010 16:56:23 GMT' LAST_MODIFIED_INVALID_STR = 'Mon, 32 Oct 2010 16:56:23 GMT' EXPIRED_LAST_MODIFIED_STR = 'Sat, 20 Oct 2007 23:21:47 GMT' -ETAG = 'b4246ffc4f62314ca13147c9d4f76974' -EXPIRED_ETAG = '7fae4cd4b0f81e7d2914700043aa8ed6' +ETAG = '"b4246ffc4f62314ca13147c9d4f76974"' +EXPIRED_ETAG = '"7fae4cd4b0f81e7d2914700043aa8ed6"' @override_settings(ROOT_URLCONF='conditional_processing.urls') @@ -24,7 +24,7 @@ class ConditionalGet(SimpleTestCase): if check_last_modified: self.assertEqual(response['Last-Modified'], LAST_MODIFIED_STR) if check_etag: - self.assertEqual(response['ETag'], '"%s"' % ETAG) + self.assertEqual(response['ETag'], ETAG) def assertNotModified(self, response): self.assertEqual(response.status_code, 304) @@ -63,66 +63,66 @@ class ConditionalGet(SimpleTestCase): self.assertEqual(response.status_code, 412) def test_if_none_match(self): - self.client.defaults['HTTP_IF_NONE_MATCH'] = '"%s"' % ETAG + self.client.defaults['HTTP_IF_NONE_MATCH'] = ETAG response = self.client.get('/condition/') self.assertNotModified(response) - self.client.defaults['HTTP_IF_NONE_MATCH'] = '"%s"' % EXPIRED_ETAG + self.client.defaults['HTTP_IF_NONE_MATCH'] = EXPIRED_ETAG response = self.client.get('/condition/') self.assertFullResponse(response) # Several etags in If-None-Match is a bit exotic but why not? - self.client.defaults['HTTP_IF_NONE_MATCH'] = '"%s", "%s"' % (ETAG, EXPIRED_ETAG) + self.client.defaults['HTTP_IF_NONE_MATCH'] = '%s, %s' % (ETAG, EXPIRED_ETAG) response = self.client.get('/condition/') self.assertNotModified(response) def test_if_match(self): - self.client.defaults['HTTP_IF_MATCH'] = '"%s"' % ETAG + self.client.defaults['HTTP_IF_MATCH'] = ETAG response = self.client.put('/condition/etag/') self.assertEqual(response.status_code, 200) - self.client.defaults['HTTP_IF_MATCH'] = '"%s"' % EXPIRED_ETAG + self.client.defaults['HTTP_IF_MATCH'] = EXPIRED_ETAG response = self.client.put('/condition/etag/') self.assertEqual(response.status_code, 412) def test_both_headers(self): # see http://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html#sec13.3.4 self.client.defaults['HTTP_IF_MODIFIED_SINCE'] = LAST_MODIFIED_STR - self.client.defaults['HTTP_IF_NONE_MATCH'] = '"%s"' % ETAG + self.client.defaults['HTTP_IF_NONE_MATCH'] = ETAG response = self.client.get('/condition/') self.assertNotModified(response) self.client.defaults['HTTP_IF_MODIFIED_SINCE'] = EXPIRED_LAST_MODIFIED_STR - self.client.defaults['HTTP_IF_NONE_MATCH'] = '"%s"' % ETAG + self.client.defaults['HTTP_IF_NONE_MATCH'] = ETAG response = self.client.get('/condition/') self.assertFullResponse(response) self.client.defaults['HTTP_IF_MODIFIED_SINCE'] = LAST_MODIFIED_STR - self.client.defaults['HTTP_IF_NONE_MATCH'] = '"%s"' % EXPIRED_ETAG + self.client.defaults['HTTP_IF_NONE_MATCH'] = EXPIRED_ETAG response = self.client.get('/condition/') self.assertFullResponse(response) self.client.defaults['HTTP_IF_MODIFIED_SINCE'] = EXPIRED_LAST_MODIFIED_STR - self.client.defaults['HTTP_IF_NONE_MATCH'] = '"%s"' % EXPIRED_ETAG + self.client.defaults['HTTP_IF_NONE_MATCH'] = EXPIRED_ETAG response = self.client.get('/condition/') self.assertFullResponse(response) def test_both_headers_2(self): self.client.defaults['HTTP_IF_UNMODIFIED_SINCE'] = LAST_MODIFIED_STR - self.client.defaults['HTTP_IF_MATCH'] = '"%s"' % ETAG + self.client.defaults['HTTP_IF_MATCH'] = ETAG response = self.client.get('/condition/') self.assertFullResponse(response) self.client.defaults['HTTP_IF_UNMODIFIED_SINCE'] = EXPIRED_LAST_MODIFIED_STR - self.client.defaults['HTTP_IF_MATCH'] = '"%s"' % EXPIRED_ETAG + self.client.defaults['HTTP_IF_MATCH'] = ETAG response = self.client.get('/condition/') self.assertEqual(response.status_code, 412) - self.client.defaults['HTTP_IF_UNMODIFIED_SINCE'] = LAST_MODIFIED_STR - self.client.defaults['HTTP_IF_MATCH'] = '"%s"' % EXPIRED_ETAG + self.client.defaults['HTTP_IF_UNMODIFIED_SINCE'] = EXPIRED_LAST_MODIFIED_STR + self.client.defaults['HTTP_IF_MATCH'] = EXPIRED_ETAG response = self.client.get('/condition/') self.assertEqual(response.status_code, 412) - self.client.defaults['HTTP_IF_UNMODIFIED_SINCE'] = EXPIRED_LAST_MODIFIED_STR - self.client.defaults['HTTP_IF_MATCH'] = '"%s"' % ETAG + self.client.defaults['HTTP_IF_UNMODIFIED_SINCE'] = LAST_MODIFIED_STR + self.client.defaults['HTTP_IF_MATCH'] = EXPIRED_ETAG response = self.client.get('/condition/') self.assertEqual(response.status_code, 412) @@ -134,7 +134,7 @@ class ConditionalGet(SimpleTestCase): self.assertFullResponse(response, check_last_modified=False) def test_single_condition_2(self): - self.client.defaults['HTTP_IF_NONE_MATCH'] = '"%s"' % ETAG + self.client.defaults['HTTP_IF_NONE_MATCH'] = ETAG response = self.client.get('/condition/etag/') self.assertNotModified(response) response = self.client.get('/condition/last_modified/') @@ -146,7 +146,7 @@ class ConditionalGet(SimpleTestCase): self.assertFullResponse(response, check_etag=False) def test_single_condition_4(self): - self.client.defaults['HTTP_IF_NONE_MATCH'] = '"%s"' % EXPIRED_ETAG + self.client.defaults['HTTP_IF_NONE_MATCH'] = EXPIRED_ETAG response = self.client.get('/condition/etag/') self.assertFullResponse(response, check_last_modified=False) @@ -158,7 +158,7 @@ class ConditionalGet(SimpleTestCase): self.assertFullResponse(response, check_last_modified=False) def test_single_condition_6(self): - self.client.defaults['HTTP_IF_NONE_MATCH'] = '"%s"' % ETAG + self.client.defaults['HTTP_IF_NONE_MATCH'] = ETAG response = self.client.get('/condition/etag2/') self.assertNotModified(response) response = self.client.get('/condition/last_modified2/') @@ -188,7 +188,34 @@ class ConditionalGet(SimpleTestCase): response = self.client.head('/condition/') self.assertNotModified(response) + def test_unquoted(self): + """ + The same quoted ETag should be set on the header regardless of whether + etag_func() in condition() returns a quoted or an unquoted ETag. + """ + response_quoted = self.client.get('/condition/etag/') + response_unquoted = self.client.get('/condition/unquoted_etag/') + self.assertEqual(response_quoted['ETag'], response_unquoted['ETag']) + + # It's possible that the matching algorithm could use the wrong value even + # if the ETag header is set correctly correctly (as tested by + # test_unquoted()), so check that the unquoted value is matched. + def test_unquoted_if_none_match(self): + self.client.defaults['HTTP_IF_NONE_MATCH'] = ETAG + response = self.client.get('/condition/unquoted_etag/') + self.assertNotModified(response) + self.client.defaults['HTTP_IF_NONE_MATCH'] = EXPIRED_ETAG + response = self.client.get('/condition/unquoted_etag/') + self.assertFullResponse(response, check_last_modified=False) + + def test_all_if_none_match(self): + self.client.defaults['HTTP_IF_NONE_MATCH'] = '*' + response = self.client.get('/condition/etag/') + self.assertNotModified(response) + response = self.client.get('/condition/no_etag/') + self.assertFullResponse(response, check_last_modified=False, check_etag=False) + def test_invalid_etag(self): - self.client.defaults['HTTP_IF_NONE_MATCH'] = r'"\"' + self.client.defaults['HTTP_IF_NONE_MATCH'] = '"""' response = self.client.get('/condition/etag/') self.assertFullResponse(response, check_last_modified=False) |