GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-07-12 16:01:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: override testsuite/testcase config verify

Browse Source
This commit is contained in:
debugtalk
2020-06-04 13:18:52 +08:00
parent 1d0df3881f
commit 80b829f75f
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
httprunner/make.py
View File

@@ -329,10 +329,10 @@ def make_testsuite(testsuite: Dict) -> NoReturn:
# validate testsuite format # validate testsuite format
load_testsuite(testsuite) load_testsuite(testsuite)
config = testsuite["config"] testsuite_config = testsuite["config"]
testsuite_path = config["path"] testsuite_path = testsuite_config["path"]
testsuite_variables = config.get("variables", {}) testsuite_variables = testsuite_config.get("variables", {})
if isinstance(testsuite_variables, Text): if isinstance(testsuite_variables, Text):
# get variables by function, e.g. ${get_variables()} # get variables by function, e.g. ${get_variables()}
project_meta = load_project_meta(testsuite_path) project_meta = load_project_meta(testsuite_path)
@@ -360,9 +360,12 @@ def make_testsuite(testsuite: Dict) -> NoReturn:
# override testcase name # override testcase name
testcase_dict["config"]["name"] = testcase["name"] testcase_dict["config"]["name"] = testcase["name"]
# override base_url # override base_url
base_url = testsuite["config"].get("base_url") or testcase.get("base_url") base_url = testsuite_config.get("base_url") or testcase.get("base_url")
if base_url: if base_url:
testcase_dict["config"]["base_url"] = base_url testcase_dict["config"]["base_url"] = base_url
# override verify
if "verify" in testsuite_config:
testcase_dict["config"]["verify"] = testsuite_config["verify"]
# override variables # override variables
testcase_dict["config"].setdefault("variables", {}) testcase_dict["config"].setdefault("variables", {})
testcase_dict["config"]["variables"].update(testcase.get("variables", {})) testcase_dict["config"]["variables"].update(testcase.get("variables", {}))

1
httprunner/runner.py
View File

@@ -101,6 +101,7 @@ class HttpRunner(object):
method = parsed_request_dict.pop("method") method = parsed_request_dict.pop("method")
url_path = parsed_request_dict.pop("url") url_path = parsed_request_dict.pop("url")
url = build_url(self.__config.base_url, url_path) url = build_url(self.__config.base_url, url_path)
parsed_request_dict["verify"] = self.__config.verify
parsed_request_dict["json"] = parsed_request_dict.pop("req_json", {}) parsed_request_dict["json"] = parsed_request_dict.pop("req_json", {})
# request # request