openstack/python-swiftclient
Code Issues Proposed changes

Merge "Skip checksum validation on partial downloads"

Browse Source
This commit is contained in:
Jenkins
2017-06-22 01:13:25 +00:00
committed by Gerrit Code Review
parent bc3171cfac 527f2ff687
commit 1d57403668
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
swiftclient/service.py
View File

@@ -387,6 +387,7 @@ class _SwiftReader(object):
# Some headers indicate the MD5 of the response # Some headers indicate the MD5 of the response
# definitely *won't* match the ETag # definitely *won't* match the ETag
bad_md5_headers = set([ bad_md5_headers = set([
'content-range',
'x-object-manifest', 'x-object-manifest',
'x-static-large-object', 'x-static-large-object',
]) ])

10
tests/unit/test_service.py
View File

@@ -141,6 +141,16 @@ class TestSwiftReader(unittest.TestCase):
self.assertFalse(sr._expected_md5) self.assertFalse(sr._expected_md5)
self.assertIsNone(sr._actual_md5) self.assertIsNone(sr._actual_md5)
def test_create_with_content_range_header(self):
# md5 should not be initialized if large object headers are present
sr = self.sr('path', 'body', {'content-range': 'bytes 0-3/10',
'etag': '"%s"' % ('0' * 32)})
self.assertEqual(sr._path, 'path')
self.assertEqual(sr._body, 'body')
self.assertIsNone(sr._content_length)
self.assertFalse(sr._expected_md5)
self.assertIsNone(sr._actual_md5)
def test_create_with_ignore_checksum(self): def test_create_with_ignore_checksum(self):
# md5 should not be initialized if checksum is False # md5 should not be initialized if checksum is False
sr = self.sr('path', 'body', {}, False) sr = self.sr('path', 'body', {}, False)