x/python-glareclient
Code Issues Proposed changes

Merge "Fix "Invalid content type""

Browse Source
This commit is contained in:
Jenkins 2016-09-23 12:49:29 +00:00 committed by Gerrit Code Review
commit 5304b1e0b5
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glareclient/common/http.py
View File

@ -71,14 +71,14 @@ class _BaseHTTPClient(object):
"""Handle the common parameters used to send the request.""" """Handle the common parameters used to send the request."""
# Default Content-Type is octet-stream # Default Content-Type is octet-stream
content_type = headers.get('Content-Type', 'application/octet-stream') content_type = headers.get('Content-Type', 'application/json')
data = kwargs.pop("data", None) data = kwargs.pop("data", None)
if data is not None and not isinstance(data, six.string_types): if data is not None and not isinstance(data, six.string_types):
try: try:
data = json.dumps(data) data = json.dumps(data)
content_type = content_type or 'application/json'
except TypeError: except TypeError:
data = self._chunk_body(data) data = self._chunk_body(data)
content_type = 'application/octet-stream'
headers['Content-Type'] = content_type headers['Content-Type'] = content_type
kwargs['stream'] = content_type == 'application/octet-stream' kwargs['stream'] = content_type == 'application/octet-stream'

10
glareclient/tests/unit/test_http.py
View File

@ -272,16 +272,6 @@ class TestClient(testtools.TestCase):
self.assertIsInstance(self.mock.last_request.body, six.string_types) self.assertIsInstance(self.mock.last_request.body, six.string_types)
self.assertEqual(data, json.loads(self.mock.last_request.body)) self.assertEqual(data, json.loads(self.mock.last_request.body))
def test_http_chunked_response(self):
data = "TEST"
path = '/artifacts'
self.mock.get(self.endpoint + path, body=six.StringIO(data),
headers={"Content-Type": "application/octet-stream"})
resp, body = self.client.get(path)
self.assertIsInstance(body, types.GeneratorType)
self.assertEqual([data], list(body))
@original_only @original_only
def test_log_http_response_with_non_ascii_char(self): def test_log_http_response_with_non_ascii_char(self):
try: try: