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: several hooks in the test will be rearranged in the alphabetical order when parsing yaml(json) which will cause the test to be failed.

Browse Source 
fix: several hooks in the test will be rearranged in the alphabetical order when parsing yaml(json) which may cause the test to be failed.
This commit is contained in:
t-bug
2019-12-06 10:36:28 +08:00
parent d54416d5d4
commit 6c7f12dd1b
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
httprunner/parser.py
View File

@@ -815,13 +815,17 @@ def _extend_with_api(test_dict, api_def_dict):
# merge & override setup_hooks
def_setup_hooks = api_def_dict.pop("setup_hooks", [])
ref_setup_hooks = test_dict.get("setup_hooks", [])
extended_setup_hooks = list(set(def_setup_hooks + ref_setup_hooks))
extended_setup_hooks_tmp = def_setup_hooks + ref_setup_hooks
extended_setup_hooks = list(set(extended_setup_hooks_tmp))
extended_setup_hooks.sort(key=extended_setup_hooks_tmp.index)
if extended_setup_hooks:
test_dict["setup_hooks"] = extended_setup_hooks
# merge & override teardown_hooks
def_teardown_hooks = api_def_dict.pop("teardown_hooks", [])
ref_teardown_hooks = test_dict.get("teardown_hooks", [])
extended_teardown_hooks = list(set(def_teardown_hooks + ref_teardown_hooks))
extended_teardown_hooks_tmp = def_teardown_hooks + ref_teardown_hooks
extended_teardown_hooks = list(set(extended_teardown_hooks_tmp))
extended_teardown_hooks.sort(key=extended_teardown_hooks_tmp.index)
if extended_teardown_hooks:
test_dict["teardown_hooks"] = extended_teardown_hooks