GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-05-12 02:21:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: try json loads request_body only if it is not None

Browse Source
This commit is contained in:
debugtalk
2020-06-04 15:30:24 +08:00
parent 359cad5ed7
commit 53c14f5c81
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
httprunner/client.py
View File

@@ -43,20 +43,21 @@ def get_req_resp_record(resp_obj: Response) -> ReqRespData:
# record actual request info
request_headers = dict(resp_obj.request.headers)
request_cookies = resp_obj.request._cookies.get_dict()
request_body = resp_obj.request.body
try:
request_body = json.loads(request_body)
except json.JSONDecodeError as ex:
# str: Unexpected UTF-8 BOM (decode using utf-8-sig)
capture_exception(ex)
except UnicodeDecodeError as ex:
# bytes/bytearray: request body in protobuf
capture_exception(ex)
except TypeError as ex:
# neither str nor bytes/bytearray, e.g. None
capture_exception(ex)
if request_body:
request_body = resp_obj.request.body
if request_body is not None:
try:
request_body = json.loads(request_body)
except json.JSONDecodeError as ex:
# str: Unexpected UTF-8 BOM (decode using utf-8-sig)
capture_exception(ex)
except UnicodeDecodeError as ex:
# bytes/bytearray: request body in protobuf
capture_exception(ex)
except TypeError as ex:
# neither str nor bytes/bytearray
capture_exception(ex)
request_content_type = lower_dict_keys(request_headers).get("content-type")
if request_content_type and "multipart/form-data" in request_content_type:
# upload file type