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

fix: each testcase should have individual session.

Browse Source
This commit is contained in:
httprunner
2018-12-03 23:14:26 +08:00
parent c2931cf088
commit 0c55b83c1a
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
httprunner/runner.py
View File

@@ -3,9 +3,14 @@
from unittest.case import SkipTest from unittest.case import SkipTest
from httprunner import exceptions, logger, response, utils from httprunner import exceptions, logger, response, utils
from httprunner.client import HttpSession from httprunner.client import HttpSession as HttpRunnerSession
from httprunner.context import SessionContext from httprunner.context import SessionContext
try:
from locust.clients import HttpSession as LocustHttpSession
except ImportError:
LocustHttpSession = None
class Runner(object): class Runner(object):
""" Running testcases. """ Running testcases.
@@ -58,7 +63,7 @@ class Runner(object):
# testcase teardown hooks # testcase teardown hooks
self.testcase_teardown_hooks = config.get("teardown_hooks", []) self.testcase_teardown_hooks = config.get("teardown_hooks", [])
self.http_client_session = http_client_session or HttpSession(base_url) self.http_client_session = http_client_session or HttpRunnerSession(base_url)
self.session_context = SessionContext(self.functions) self.session_context = SessionContext(self.functions)
if testcase_setup_hooks: if testcase_setup_hooks:
@@ -71,7 +76,7 @@ class Runner(object):
def __clear_test_data(self): def __clear_test_data(self):
""" clear request and response data """ clear request and response data
""" """
if not isinstance(self.http_client_session, HttpSession): if not isinstance(self.http_client_session, HttpRunnerSession):
return return
self.validation_results = [] self.validation_results = []
@@ -80,7 +85,7 @@ class Runner(object):
def __get_test_data(self): def __get_test_data(self):
""" get request/response data and validate results """ get request/response data and validate results
""" """
if not isinstance(self.http_client_session, HttpSession): if not isinstance(self.http_client_session, HttpRunnerSession):
return return
meta_data = self.http_client_session.meta_data meta_data = self.http_client_session.meta_data
@@ -236,7 +241,6 @@ class Runner(object):
# teardown hooks # teardown hooks
teardown_hooks = test_dict.get("teardown_hooks", []) teardown_hooks = test_dict.get("teardown_hooks", [])
if teardown_hooks: if teardown_hooks:
logger.log_info("start to run teardown hooks")
self.session_context.update_test_variables("response", resp_obj) self.session_context.update_test_variables("response", resp_obj)
self.do_hook_actions(teardown_hooks, "teardown") self.do_hook_actions(teardown_hooks, "teardown")
@@ -275,7 +279,15 @@ class Runner(object):
""" """
self.meta_datas = [] self.meta_datas = []
config = testcase_dict.get("config", {}) config = testcase_dict.get("config", {})
test_runner = Runner(config, self.functions, self.http_client_session) base_url = config.get("base_url")
# each testcase should have individual session.
if LocustHttpSession and isinstance(self.http_client_session, LocustHttpSession):
http_client_session = LocustHttpSession(base_url)
else:
http_client_session = HttpRunnerSession(base_url)
test_runner = Runner(config, self.functions, http_client_session)
tests = testcase_dict.get("tests", []) tests = testcase_dict.get("tests", [])