dkirillov/s3-tests
1
0
Fork 0
forked from TrueCloudLab/s3-tests
Code Pull requests Activity

Merge branch 'wip-bi-sharding-3' into wip-rgw-versioning-3

Browse source 
Conflicts:
	s3tests/functional/test_s3.py
This commit is contained in:
Yehuda Sadeh 2015-01-22 15:24:07 -08:00
commit f33a86b388
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
s3tests/functional/test_s3.py
View file

@ -2089,6 +2089,9 @@ def test_put_object_ifmatch_failed():
eq(e.reason, 'Precondition Failed')
eq(e.error_code, 'PreconditionFailed')
got_old_data = key.get_contents_as_string()
eq(got_old_data, 'bar')
@attr(resource='object')
@attr(method='put')
@ -2120,6 +2123,10 @@ def test_put_object_ifmatch_nonexisted_failed():
eq(e.reason, 'Precondition Failed')
eq(e.error_code, 'PreconditionFailed')
e = assert_raises(boto.exception.S3ResponseError, key.get_contents_as_string)
eq(e.status, 404)
eq(e.reason, 'Not Found')
eq(e.error_code, 'NoSuchKey')
@attr(resource='object')
@attr(method='put')
@ -2156,6 +2163,8 @@ def test_put_object_ifnonmatch_failed():
eq(e.reason, 'Precondition Failed')
eq(e.error_code, 'PreconditionFailed')
got_old_data = key.get_contents_as_string()
eq(got_old_data, 'bar')
@attr(resource='object')
@attr(method='put')
@ -2188,6 +2197,9 @@ def test_put_object_ifnonmatch_overwrite_existed_failed():
eq(e.reason, 'Precondition Failed')
eq(e.error_code, 'PreconditionFailed')
got_old_data = key.get_contents_as_string()
eq(got_old_data, 'bar')
def _setup_request(bucket_acl=None, object_acl=None):
"""