TrueCloudLab/s3-tests
7
0
Fork 1
mirror of https://github.com/ceph/s3-tests.git synced 2024-11-28 09:31:38 +00:00
Code Issues 1 Projects Releases Packages Wiki Activity

functional._make_request: go back to simple version of httplib.request.

Browse source 
The httplib.request function automatically constructs the following
headers:
content-length, host, accept-encoding

Until such time as we need to override those values in incompatible
ways, simply use it.

Fixes: https://github.com/ceph/s3-tests/pull/92#issuecomment-185970260
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
This commit is contained in:
Robin H. Johnson 2016-03-27 02:36:46 +00:00
parent 94fa405270
commit 8da96c83af
1 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
s3tests/functional/__init__.py
View file

@ -408,11 +408,10 @@ def _make_request(method, bucket, key, body=None, authenticated=False, response_
return the response (status, reason). return the response (status, reason).
If key is None, then this will be treated as a bucket-level request. If key is None, then this will be treated as a bucket-level request.
If the request or response headers are None, then default values will be
provided by later methods.
""" """
if response_headers is None:
response_headers = {}
if request_headers is None:
request_headers = {}
if not path_style: if not path_style:
conn = bucket.connection conn = bucket.connection
request_headers['Host'] = conn.calling_format.build_host(conn.server_name(), bucket.name) request_headers['Host'] = conn.calling_format.build_host(conn.server_name(), bucket.name)
@ -468,17 +467,11 @@ def _make_raw_request(host, port, method, path, body=None, request_headers=None,
if request_headers is None: if request_headers is None:
request_headers = {} request_headers = {}
skip_host=('Host' in request_headers)
skip_accept_encoding = False
c = class_(host, port, strict=True, timeout=timeout) c = class_(host, port, strict=True, timeout=timeout)
# We do the request manually, so we can muck with headers # TODO: We might have to modify this in future if we need to interact with
#c.request(method, path, body=body, headers=request_headers) # how httplib.request handles Accept-Encoding and Host.
c.connect() c.request(method, path, body=body, headers=request_headers)
c.putrequest(method, path, skip_host, skip_accept_encoding)
for k,v in request_headers.items():
c.putheader(k,v)
c.endheaders(message_body=body)
res = c.getresponse() res = c.getresponse()
#c.close() #c.close()