]> git-server-git.apps.pok.os.sepia.ceph.com Git - s3-tests.git/commitdiff
Fix 'If-Modified-Since' format string 136/head
authorEvgenii Gorinov <jonny-k@agent05.haze.yandex.net>
Wed, 9 Nov 2016 16:19:13 +0000 (19:19 +0300)
committerEvgenii Gorinov <jonny-k@yandex-team.ru>
Tue, 7 Mar 2017 20:04:41 +0000 (23:04 +0300)
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 <korvin.lucky@gmail.com>
s3tests/functional/test_s3.py

index f2a5e54b3b6c85a1fd7218c30f6c7a42fee7e9a4..42c251f2ec4c65efa87bcdd1810c00f9985f9e2b 100644 (file)
@@ -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')