x/swift3
Code Issues Proposed changes

Merge "S3 allows fewer etags than actual uploaded parts"

Browse Source
This commit is contained in:
Jenkins
2015-04-20 05:00:47 +00:00
committed by Gerrit Code Review
parent 3bd412b33d 813b0b5777
commit e85725d413
1 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
swift3/test/functional/test_multi_upload.py
View File

@@ -35,7 +35,6 @@ class TestSwift3MultiUpload(Swift3FunctionalTestCase):
for i, etag in enumerate(etags): for i, etag in enumerate(etags):
elem_part = SubElement(elem, 'Part') elem_part = SubElement(elem, 'Part')
SubElement(elem_part, 'PartNumber').text = str(i + 1) SubElement(elem_part, 'PartNumber').text = str(i + 1)
if etag:
SubElement(elem_part, 'ETag').text = etag SubElement(elem_part, 'ETag').text = etag
return tostring(elem) return tostring(elem)
@@ -467,14 +466,6 @@ class TestSwift3MultiUpload(Swift3FunctionalTestCase):
query=query) query=query)
self.assertEquals(get_error_code(body), 'MalformedXML') self.assertEquals(get_error_code(body), 'MalformedXML')
# with fiewer etags in xml
etags[1] = ''
xml = self._gen_comp_xml(etags)
status, headers, body = \
self.conn.make_request('POST', bucket, keys[0], body=xml,
query=query)
self.assertEquals(get_error_code(body), 'MalformedXML')
# with ivalid etag in xml # with ivalid etag in xml
invalid_etag = 'invalid' invalid_etag = 'invalid'
xml = self._gen_comp_xml([invalid_etag]) xml = self._gen_comp_xml([invalid_etag])
@@ -496,5 +487,30 @@ class TestSwift3MultiUpload(Swift3FunctionalTestCase):
query=query) query=query)
self.assertEquals(get_error_code(body), 'InvalidPart') self.assertEquals(get_error_code(body), 'InvalidPart')
def test_complete_upload_with_fewer_etags(self):
bucket = 'bucket'
key = 'obj'
self.conn.make_request('PUT', bucket)
query = 'uploads'
status, headers, body = \
self.conn.make_request('POST', bucket, key, query=query)
elem = fromstring(body, 'InitiateMultipartUploadResult')
upload_id = elem.find('UploadId').text
etags = []
for i in xrange(1, 4):
query = 'partNumber=%s&uploadId=%s' % (i, upload_id)
status, headers, body = \
self.conn.make_request('PUT', bucket, key,
body='A' * 1024 * 1024 * 5, query=query)
etags.append(headers['etag'])
query = 'uploadId=%s' % upload_id
xml = self._gen_comp_xml(etags[:-1])
status, headers, body = \
self.conn.make_request('POST', bucket, key, body=xml,
query=query)
self.assertEquals(status, 200)
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()