From 217f0d520f0ba41aadf37e4d1ad2037d91c2bb40 Mon Sep 17 00:00:00 2001 From: Evgenii Gorinov Date: Wed, 9 Nov 2016 19:19:13 +0300 Subject: [PATCH] Fix 'If-Modified-Since' format string According to https://tools.ietf.org/html/rfc7232 header 'If-Modified-Since' should be a correct HTTP-date. For example: `Tue, 15 Nov 1994 12:45:26 GMT`; not `1994-11-15T12:45:26.000Z`. Signed-off-by: Evgenii Gorinov --- s3tests/functional/test_s3.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/s3tests/functional/test_s3.py b/s3tests/functional/test_s3.py index f2a5e54..42c251f 100644 --- a/s3tests/functional/test_s3.py +++ b/s3tests/functional/test_s3.py @@ -2435,13 +2435,14 @@ def test_get_object_ifmodifiedsince_failed(): for k in bucket.get_all_keys(): key = k - mtime = time.strptime(key.last_modified, '%Y-%m-%dT%H:%M:%S.%fZ') + mtime = datetime.datetime.strptime(key.last_modified, '%Y-%m-%dT%H:%M:%S.%fZ') - after = time.ctime(time.mktime(mtime) + 1) + after = mtime + datetime.timedelta(seconds=1) + after_str = time.strftime("%a, %d %b %Y %H:%M:%S GMT", after.timetuple()) time.sleep(1) - e = assert_raises(boto.exception.S3ResponseError, bucket.get_key, 'foo', headers={'If-Modified-Since': after}) + e = assert_raises(boto.exception.S3ResponseError, bucket.get_key, 'foo', headers={'If-Modified-Since': after_str}) eq(e.status, 304) eq(e.reason, 'Not Modified')