mirror of
https://github.com/ceph/s3-tests.git
synced 2024-11-21 23:29:47 +00:00
s3tests: modify test_get_object_ifmodifiedsince_failed
Use key's last_modified instead of local time Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
This commit is contained in:
parent
3e3eb4908d
commit
99f237e552
1 changed files with 8 additions and 5 deletions
|
@ -2357,11 +2357,14 @@ def test_get_object_ifmodifiedsince_failed():
|
||||||
key = bucket.new_key('foo')
|
key = bucket.new_key('foo')
|
||||||
key.set_contents_from_string('bar')
|
key.set_contents_from_string('bar')
|
||||||
|
|
||||||
# Sleep since Amazon returns 200 if the date is in the future:
|
for k in bucket.get_all_keys():
|
||||||
# https://forums.aws.amazon.com/message.jspa?messageID=325930
|
key = k
|
||||||
now = time.time()
|
|
||||||
time.sleep(20)
|
mtime = time.strptime(key.last_modified, '%Y-%m-%dT%H:%M:%S.%fZ')
|
||||||
after = formatdate(now + 10)
|
|
||||||
|
after = time.ctime(time.mktime(mtime) + 1)
|
||||||
|
|
||||||
|
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})
|
||||||
eq(e.status, 304)
|
eq(e.status, 304)
|
||||||
|
|
Loading…
Reference in a new issue