From 95b1dc44e8a98035f68c5b949450ec12481ada82 Mon Sep 17 00:00:00 2001 From: rockfeng0 Date: Mon, 11 Jun 2018 11:14:00 +0800 Subject: [PATCH 1/7] pydev --- .project | 17 +++++++++++++++++ .pydevproject | 8 ++++++++ 2 files changed, 25 insertions(+) create mode 100644 .project create mode 100644 .pydevproject diff --git a/.project b/.project new file mode 100644 index 00000000..647036ba --- /dev/null +++ b/.project @@ -0,0 +1,17 @@ + + + httprunner + + + + + + org.python.pydev.PyDevBuilder + + + + + + org.python.pydev.pythonNature + + diff --git a/.pydevproject b/.pydevproject new file mode 100644 index 00000000..38dde01e --- /dev/null +++ b/.pydevproject @@ -0,0 +1,8 @@ + + + +/${PROJECT_DIR_NAME} + +python interpreter +C:\Users\58-pc\VirtualEnvs\test_pj\Scripts\python.exe + From ec1e916c9853f00ae4055737b939443448681984 Mon Sep 17 00:00:00 2001 From: rockfeng0 Date: Tue, 12 Jun 2018 17:26:34 +0800 Subject: [PATCH 2/7] support->extract: [JSESSIONID: request.headers.cookie.JSESSIONID] --- httprunner/response.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/httprunner/response.py b/httprunner/response.py index 34e42073..d00a397c 100644 --- a/httprunner/response.py +++ b/httprunner/response.py @@ -6,6 +6,7 @@ import re from httprunner import exception, logger, testcase, utils from httprunner.compat import OrderedDict, basestring from requests.structures import CaseInsensitiveDict +from requests.models import PreparedRequest text_extractor_regexp_compile = re.compile(r".*\(.*\).*") @@ -95,7 +96,11 @@ class ResponseObject(object): # TODO: remove compatibility for content, text if isinstance(top_query_content, bytes): top_query_content = top_query_content.decode("utf-8") - top_query_content = json.loads(top_query_content) + + if isinstance(top_query_content, PreparedRequest): + top_query_content = top_query_content.__dict__ + else: + top_query_content = json.loads(top_query_content) except json.decoder.JSONDecodeError: err_msg = u"Failed to extract data with delimiter!\n" err_msg += u"response content: {}\n".format(self.content) From 40cb2dcac65a96154e9c5b10edf8bc9e30b561de Mon Sep 17 00:00:00 2001 From: rockfeng0 Date: Tue, 12 Jun 2018 17:34:35 +0800 Subject: [PATCH 3/7] support-> {"extract": ["head_cookie": "request.headers.cookie"]} --- httprunner/runner.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/httprunner/runner.py b/httprunner/runner.py index 72dd7a4d..cde586d8 100644 --- a/httprunner/runner.py +++ b/httprunner/runner.py @@ -178,7 +178,7 @@ class Runner(object): extractors = testcase_dict.get("extract", []) or testcase_dict.get("extractors", []) extracted_variables_mapping = resp_obj.extract_response(extractors) self.context.bind_extracted_variables(extracted_variables_mapping) - + #print(self.context.testcase_parser.variables) # validate validators = testcase_dict.get("validate", []) or testcase_dict.get("validators", []) try: From 00bf423c34e5503cf9636751438729b4f2f2387f Mon Sep 17 00:00:00 2001 From: rock feng Date: Wed, 13 Jun 2018 19:55:42 +0800 Subject: [PATCH 4/7] Delete .pydevproject --- .pydevproject | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 .pydevproject diff --git a/.pydevproject b/.pydevproject deleted file mode 100644 index 38dde01e..00000000 --- a/.pydevproject +++ /dev/null @@ -1,8 +0,0 @@ - - - -/${PROJECT_DIR_NAME} - -python interpreter -C:\Users\58-pc\VirtualEnvs\test_pj\Scripts\python.exe - From ccfdec9e3d7956f969d4edd62e0e13661eab7e80 Mon Sep 17 00:00:00 2001 From: rock feng Date: Wed, 13 Jun 2018 19:55:56 +0800 Subject: [PATCH 5/7] Delete .project --- .project | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 .project diff --git a/.project b/.project deleted file mode 100644 index 647036ba..00000000 --- a/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - httprunner - - - - - - org.python.pydev.PyDevBuilder - - - - - - org.python.pydev.pythonNature - - From 9cd7d92dced483bc8bb4da1e5d8f9320b4148ce8 Mon Sep 17 00:00:00 2001 From: rock feng Date: Wed, 13 Jun 2018 19:56:37 +0800 Subject: [PATCH 6/7] Update runner.py --- httprunner/runner.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/httprunner/runner.py b/httprunner/runner.py index cde586d8..00919d12 100644 --- a/httprunner/runner.py +++ b/httprunner/runner.py @@ -178,7 +178,7 @@ class Runner(object): extractors = testcase_dict.get("extract", []) or testcase_dict.get("extractors", []) extracted_variables_mapping = resp_obj.extract_response(extractors) self.context.bind_extracted_variables(extracted_variables_mapping) - #print(self.context.testcase_parser.variables) + # validate validators = testcase_dict.get("validate", []) or testcase_dict.get("validators", []) try: From 8c4f3c9fc24c612976b69115a77b080b5f49283d Mon Sep 17 00:00:00 2001 From: junpeng chu Date: Fri, 22 Jun 2018 10:50:26 +0800 Subject: [PATCH 7/7] fix locusts for test api and suite --- httprunner/locusts.py | 1 + 1 file changed, 1 insertion(+) diff --git a/httprunner/locusts.py b/httprunner/locusts.py index 25ec95fa..28e58403 100644 --- a/httprunner/locusts.py +++ b/httprunner/locusts.py @@ -40,6 +40,7 @@ def gen_locustfile(testcase_file_path): "templates", "locustfile_template" ) + TestcaseLoader.load_test_dependencies() testset = TestcaseLoader.load_test_file(testcase_file_path) host = testset.get("config", {}).get("request", {}).get("base_url", "")