From 9f5129575c1f86aedaba9151ec3588b88b52089e Mon Sep 17 00:00:00 2001 From: Orit Wasserman Date: Mon, 11 Apr 2016 20:21:37 +0200 Subject: [PATCH] Revert "remove invalid multi-part upload tests" This reverts commit 41c8be0584530d189c1c245a88073e771ac05e53. --- s3tests/functional/test_s3.py | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/s3tests/functional/test_s3.py b/s3tests/functional/test_s3.py index 5445ce5..cdd61f8 100644 --- a/s3tests/functional/test_s3.py +++ b/s3tests/functional/test_s3.py @@ -5181,6 +5181,36 @@ def test_list_multipart_upload(): upload2.cancel_upload() upload3.cancel_upload() +@attr(resource='object') +@attr(method='put') +@attr(operation='multi-part upload with missing part') +def test_multipart_upload_missing_part(): + bucket = get_new_bucket() + key_name = "mymultipart" + mp = bucket.initiate_multipart_upload(key_name) + mp.upload_part_from_file(StringIO('\x00'), 1) + xml = mp.to_xml() + xml = xml.replace('1', '9999') + e = assert_raises(boto.exception.S3ResponseError, bucket.complete_multipart_upload, key_name, mp.id, xml) + eq(e.status, 400) + eq(e.reason.lower(), 'bad request') # some proxies vary the case + eq(e.error_code, 'InvalidPart') + +@attr(resource='object') +@attr(method='put') +@attr(operation='multi-part upload with incorrect ETag') +def test_multipart_upload_incorrect_etag(): + bucket = get_new_bucket() + key_name = "mymultipart" + mp = bucket.initiate_multipart_upload(key_name) + mp.upload_part_from_file(StringIO('\x00'), 1) + xml = mp.to_xml() + xml = xml.replace('"93b885adfe0da089cdf634904fd59f71"', '"ffffffffffffffffffffffffffffffff"') + e = assert_raises(boto.exception.S3ResponseError, bucket.complete_multipart_upload, key_name, mp.id, xml) + eq(e.status, 400) + eq(e.reason.lower(), 'bad request') # some proxies vary the case + eq(e.error_code, 'InvalidPart') + def _simple_http_req_100_cont(host, port, is_secure, method, resource): """ Send the specified request w/expect 100-continue