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

fix #818: request missed url in setup_hooks

Browse Source
This commit is contained in:
debugtalk
2020-01-02 21:42:49 +08:00
parent 8d7ee0de9f
commit 36efdced08
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/CHANGELOG.md
View File

@@ -6,6 +6,7 @@
- fix #826: Windows does not support file name include ":" - fix #826: Windows does not support file name include ":"
- fix #819: maximum recursion error in locusts - fix #819: maximum recursion error in locusts
- fix #818: request missed url in setup_hooks
## 2.5.1 (2020-01-02) ## 2.5.1 (2020-01-02)

10
httprunner/runner.py
View File

@@ -213,16 +213,16 @@ class Runner(object):
parsed_test_request = self.session_context.eval_content(raw_request) parsed_test_request = self.session_context.eval_content(raw_request)
self.session_context.update_test_variables("request", parsed_test_request) self.session_context.update_test_variables("request", parsed_test_request)
# prepend url with base_url unless it's already an absolute URL
url = parsed_test_request.pop('url')
base_url = self.session_context.eval_content(test_dict.get("base_url", ""))
parsed_url = utils.build_url(base_url, url)
# setup hooks # setup hooks
setup_hooks = test_dict.get("setup_hooks", []) setup_hooks = test_dict.get("setup_hooks", [])
if setup_hooks: if setup_hooks:
self.do_hook_actions(setup_hooks, HookTypeEnum.SETUP) self.do_hook_actions(setup_hooks, HookTypeEnum.SETUP)
# prepend url with base_url unless it's already an absolute URL
url = parsed_test_request.pop('url')
base_url = self.session_context.eval_content(test_dict.get("base_url", ""))
parsed_url = utils.build_url(base_url, url)
try: try:
method = parsed_test_request.pop('method') method = parsed_test_request.pop('method')
parsed_test_request.setdefault("verify", self.verify) parsed_test_request.setdefault("verify", self.verify)