Merge "Handle empty response content during its decoding in std.http"

This commit is contained in:
Jenkins 2017-07-17 19:28:20 +00:00 committed by Gerrit Code Review
commit 8d24a8bad7
2 changed files with 66 additions and 1 deletions

View File

@ -206,7 +206,7 @@ class HTTPAction(actions.Action):
except Exception as e:
LOG.debug("HTTP action response is not json.")
content = resp.content
if resp.encoding != 'utf-8':
if content and resp.encoding != 'utf-8':
content = content.decode(resp.encoding).encode('utf-8')
_result = {

View File

@ -49,6 +49,14 @@ def get_error_fake_response():
)
def get_fake_response(content, code, **kwargs):
return base.FakeHTTPResponse(
content,
code,
**kwargs
)
class HTTPActionTest(base.BaseTest):
@mock.patch.object(requests, 'request')
def test_http_action(self, mocked_method):
@ -207,3 +215,60 @@ class HTTPActionTest(base.BaseTest):
proxies=None,
verify=None
)
@mock.patch.object(requests, 'request')
def test_http_action_empty_resp(self, mocked_method):
action = std.HTTPAction(
url=URL,
method='GET',
timeout=20,
allow_redirects=True
)
self.assertEqual(URL, action.url)
mocked_method.return_value = get_fake_response(
content=None, code=200, encoding=None
)
mock_ctx = mock.Mock()
result = action.run(mock_ctx)
self.assertIsNone(result['content'])
self.assertEqual(200, result['status'])
mocked_method.assert_called_with(
'GET',
URL,
headers=None,
cookies=None,
params=None,
data=None,
timeout=20,
auth=None,
allow_redirects=True,
proxies=None,
verify=None
)
mocked_method.return_value = get_fake_response(
content='', code=204, encoding=None
)
mock_ctx = mock.Mock()
result = action.run(mock_ctx)
self.assertEqual('', result['content'])
self.assertEqual(204, result['status'])
mocked_method.assert_called_with(
'GET',
URL,
headers=None,
cookies=None,
params=None,
data=None,
timeout=20,
auth=None,
allow_redirects=True,
proxies=None,
verify=None
)