diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 6ed7dfa3..6211169f 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -6,6 +6,7 @@ - fix #826: Windows does not support file name include ":" - fix #819: maximum recursion error in locusts +- fix #818: request missed url in setup_hooks ## 2.5.1 (2020-01-02) diff --git a/httprunner/runner.py b/httprunner/runner.py index b2d1b2f3..7f24f1b5 100644 --- a/httprunner/runner.py +++ b/httprunner/runner.py @@ -213,16 +213,16 @@ class Runner(object): parsed_test_request = self.session_context.eval_content(raw_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 = test_dict.get("setup_hooks", []) if setup_hooks: 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: method = parsed_test_request.pop('method') parsed_test_request.setdefault("verify", self.verify)