GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-05-20 23:59:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into save-variables-output

Browse Source
This commit is contained in:
debugtalk
2019-02-28 15:32:34 +08:00
parent 29faf4a5ea 396b47334e
commit 3cbeb0eb8b
2 changed files with 38 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
httprunner/parser.py
View File

@@ -731,9 +731,6 @@ def _extend_with_testcase(test_dict, testcase_def_dict):
if not testcase_def_dict["config"].get("base_url"):
testcase_def_dict["config"]["base_url"] = test_base_url
test_verify = test_dict.pop("verify", True)
testcase_def_dict["config"].setdefault("verify", test_verify)
# override name
test_name = test_dict.pop("name") or testcase_def_dict["config"].pop("name") or "Undefined name"
@@ -845,6 +842,9 @@ def __parse_testcase_tests(tests, config, project_mapping):
testcase_def = test_dict.pop("testcase_def")
_extend_with_testcase(test_dict, testcase_def)
# verify priority: nested testcase config > testcase config
test_dict["config"].setdefault("verify", config_verify)
# 3, testcase_def config => testcase_def test_dict
_parse_testcase(test_dict, project_mapping)