openstack/swift
Code Issues Proposed changes

Merge "Include params in multipart message part content-type"

Browse Source
This commit is contained in:
Jenkins 2015-11-26 04:41:53 +00:00 committed by Gerrit Code Review
commit ea3a0d38c1
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
swift/common/swob.py
View File

@ -1184,7 +1184,7 @@ class Response(object):
"""
content_size = self.content_length
content_type = self.content_type
content_type = self.headers.get('content-type')
self.content_type = ''.join(['multipart/byteranges;',
'boundary=', self.boundary])

8
test/unit/common/test_swob.py
View File

@ -1228,21 +1228,21 @@ class TestResponse(unittest.TestCase):
resp.conditional_response = True
resp.content_length = 100
resp.content_type = 'text/plain'
resp.content_type = 'text/plain; charset=utf8'
content = ''.join(resp._response_iter(None,
('0123456789112345678'
'92123456789')))
self.assertTrue(re.match(('--[a-f0-9]{32}\r\n'
'Content-Type: text/plain\r\n'
'Content-Type: text/plain; charset=utf8\r\n'
'Content-Range: bytes '
'0-9/100\r\n\r\n0123456789\r\n'
'--[a-f0-9]{32}\r\n'
'Content-Type: text/plain\r\n'
'Content-Type: text/plain; charset=utf8\r\n'
'Content-Range: bytes '
'10-19/100\r\n\r\n1123456789\r\n'
'--[a-f0-9]{32}\r\n'
'Content-Type: text/plain\r\n'
'Content-Type: text/plain; charset=utf8\r\n'
'Content-Range: bytes '
'20-29/100\r\n\r\n2123456789\r\n'
'--[a-f0-9]{32}--'), content))