summaryrefslogtreecommitdiff
path: root/tests/conditional_processing
diff options
context:
space:
mode:
authorJosh Schneier <josh.schneier@gmail.com>2017-06-06 15:37:14 -0400
committerTim Graham <timograham@gmail.com>2017-06-06 15:37:14 -0400
commit37c9b81ebc9af3b61345a070a143ee8330a119b4 (patch)
tree5f2597de32d937fd05dc11b589da66a6fb833078 /tests/conditional_processing
parent268a646353c6fa9e5fc3730e13b386ddabb018ef (diff)
Fixed #28104 -- Prevented condition decorator from setting ETag/Last-Modified headers for non-safe requests.
Diffstat (limited to 'tests/conditional_processing')
-rw-r--r--tests/conditional_processing/tests.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/tests/conditional_processing/tests.py b/tests/conditional_processing/tests.py
index fd0b10cef4..349b1cf7fe 100644
--- a/tests/conditional_processing/tests.py
+++ b/tests/conditional_processing/tests.py
@@ -19,10 +19,14 @@ class ConditionalGet(SimpleTestCase):
def assertFullResponse(self, response, check_last_modified=True, check_etag=True):
self.assertEqual(response.status_code, 200)
self.assertEqual(response.content, FULL_RESPONSE.encode())
- if check_last_modified:
- self.assertEqual(response['Last-Modified'], LAST_MODIFIED_STR)
- if check_etag:
- self.assertEqual(response['ETag'], ETAG)
+ if response.request['REQUEST_METHOD'] in ('GET', 'HEAD'):
+ if check_last_modified:
+ self.assertEqual(response['Last-Modified'], LAST_MODIFIED_STR)
+ if check_etag:
+ self.assertEqual(response['ETag'], ETAG)
+ else:
+ self.assertNotIn('Last-Modified', response)
+ self.assertNotIn('ETag', response)
def assertNotModified(self, response):
self.assertEqual(response.status_code, 304)