From d5457c040a502b3997fc8f365ba682df731cec0f Mon Sep 17 00:00:00 2001 From: fengyu Date: Tue, 5 Nov 2019 14:12:30 +0800 Subject: [PATCH] =?UTF-8?q?fix=20teardown=5Fhook=E5=AF=B9response=E7=9A=84?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BD=93=E7=8E=B0=E5=9C=A8=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E6=8A=A5=E5=91=8A=E4=B8=8A=20httprunner#430?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- httprunner/client.py | 14 ++++++++++++-- httprunner/runner.py | 1 + 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/httprunner/client.py b/httprunner/client.py index bc7cd07e..0a2af89e 100644 --- a/httprunner/client.py +++ b/httprunner/client.py @@ -8,7 +8,7 @@ from requests import Request, Response from requests.exceptions import (InvalidSchema, InvalidURL, MissingSchema, RequestException) -from httprunner import logger +from httprunner import logger, response from httprunner.utils import lower_dict_keys, omit_long_data urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) @@ -115,7 +115,10 @@ class HttpSession(requests.Session): else: try: # try to record json data - req_resp_dict["response"]["json"] = resp_obj.json() + if isinstance(resp_obj, response.ResponseObject): + req_resp_dict["response"]["json"] = resp_obj.json + else: + req_resp_dict["response"]["json"] = resp_obj.json() except ValueError: # only record at most 512 text charactors resp_text = resp_obj.text @@ -126,6 +129,13 @@ class HttpSession(requests.Session): return req_resp_dict + def update_last_req_resp_record(self, resp_obj): + """ + update request and response info from Response() object. + """ + self.meta_data["data"].pop() + self.meta_data["data"].append(self.get_req_resp_record(resp_obj)) + def request(self, method, url, name=None, **kwargs): """ Constructs and sends a :py:class:`requests.Request`. diff --git a/httprunner/runner.py b/httprunner/runner.py index 7fe68b4f..13f0a9c9 100644 --- a/httprunner/runner.py +++ b/httprunner/runner.py @@ -260,6 +260,7 @@ class Runner(object): if teardown_hooks: self.session_context.update_test_variables("response", resp_obj) self.do_hook_actions(teardown_hooks, "teardown") + self.http_client_session.update_last_req_resp_record(resp_obj) # extract extractors = test_dict.get("extract", {})