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

s3tests: adjust copy tests to test copy of larger objects

Browse source 
rgw has different code paths for objects > 512k

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
This commit is contained in:
Yehuda Sadeh 2015-06-17 13:10:23 -07:00
parent 226f5eb507
commit 5407628c3a
1 changed files with 28 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
s3tests/functional/test_s3.py
View file

@ -4484,39 +4484,41 @@ def test_object_copy_canned_acl():
@attr(method='put') @attr(method='put')
@attr(operation='copy object and retain metadata') @attr(operation='copy object and retain metadata')
def test_object_copy_retaining_metadata(): def test_object_copy_retaining_metadata():
bucket = get_new_bucket() for size in [3, 1024 * 1024]:
key = bucket.new_key('foo123bar') bucket = get_new_bucket()
metadata = {'key1': 'value1', 'key2': 'value2'} key = bucket.new_key('foo123bar')
key.set_metadata('key1', 'value1') metadata = {'key1': 'value1', 'key2': 'value2'}
key.set_metadata('key2', 'value2') key.set_metadata('key1', 'value1')
content_type = 'audio/ogg' key.set_metadata('key2', 'value2')
key.content_type = content_type content_type = 'audio/ogg'
key.set_contents_from_string('foo') key.content_type = content_type
key.set_contents_from_string(str(bytearray(size)))
bucket.copy_key('bar321foo', bucket.name, 'foo123bar') bucket.copy_key('bar321foo', bucket.name, 'foo123bar')
key2 = bucket.get_key('bar321foo') key2 = bucket.get_key('bar321foo')
eq(key2.size, 3) eq(key2.size, size)
eq(key2.metadata, metadata) eq(key2.metadata, metadata)
eq(key2.content_type, content_type) eq(key2.content_type, content_type)
@attr(resource='object') @attr(resource='object')
@attr(method='put') @attr(method='put')
@attr(operation='copy object and replace metadata') @attr(operation='copy object and replace metadata')
def test_object_copy_replacing_metadata(): def test_object_copy_replacing_metadata():
bucket = get_new_bucket() for size in [3, 1024 * 1024]:
key = bucket.new_key('foo123bar') bucket = get_new_bucket()
key.set_metadata('key1', 'value1') key = bucket.new_key('foo123bar')
key.set_metadata('key2', 'value2') key.set_metadata('key1', 'value1')
key.content_type = 'audio/ogg' key.set_metadata('key2', 'value2')
key.set_contents_from_string('foo') key.content_type = 'audio/ogg'
key.set_contents_from_string(str(bytearray(size)))
metadata = {'key3': 'value3', 'key1': 'value4'} metadata = {'key3': 'value3', 'key1': 'value4'}
content_type = 'audio/mpeg' content_type = 'audio/mpeg'
bucket.copy_key('bar321foo', bucket.name, 'foo123bar', metadata=metadata, headers={'Content-Type': content_type}) bucket.copy_key('bar321foo', bucket.name, 'foo123bar', metadata=metadata, headers={'Content-Type': content_type})
key2 = bucket.get_key('bar321foo') key2 = bucket.get_key('bar321foo')
eq(key2.size, 3) eq(key2.size, size)
eq(key2.metadata, metadata) eq(key2.metadata, metadata)
eq(key2.content_type, content_type) eq(key2.content_type, content_type)
def transfer_part(bucket, mp_id, mp_keyname, i, part): def transfer_part(bucket, mp_id, mp_keyname, i, part):
"""Transfer a part of a multipart upload. Designed to be run in parallel. """Transfer a part of a multipart upload. Designed to be run in parallel.