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

Merge pull request #1351 from billduan/fix_step_variables

Browse Source 
fix: unexpected changes in step variables
This commit is contained in:
debugtalk
2022-06-13 22:35:28 +08:00
committed by GitHub
parent d4c1f00317 e87218099f
commit 2d0d8c3016
3 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
httprunner/step_sql_request.py
View File

@@ -50,10 +50,10 @@ def run_step_sql_request(runner: HttpRunner, step: TStep) -> StepResult:
name=step.name,
success=False,
)
step.variables = runner.merge_step_variables(step.variables)
step_variables = runner.merge_step_variables(step.variables)
# parse
request_dict = step.sql_request.dict()
parsed_request_dict = runner.parser.parse_data(request_dict, step.variables)
parsed_request_dict = runner.parser.parse_data(request_dict, step_variables)
config = runner.get_config()
parsed_request_dict["db_config"]["psm"] = (
parsed_request_dict["db_config"]["psm"] or config.db.psm
@@ -92,7 +92,7 @@ def run_step_sql_request(runner: HttpRunner, step: TStep) -> StepResult:
# setup hooks
if step.setup_hooks:
call_hooks(runner, step.setup_hooks, step.variables, "setup request")
call_hooks(runner, step.setup_hooks, step_variables, "setup request")
# log request
sql_request_print = "====== sql request details ======\n"
@@ -136,11 +136,11 @@ def run_step_sql_request(runner: HttpRunner, step: TStep) -> StepResult:
allure.attach(sql_request_print, name="sql response details", attachment_type=allure.attachment_type.TEXT)
resp_obj = SqlResponseObject(sql_resp, parser=runner.parser)
step.variables["sql_response"] = resp_obj
step_variables["sql_response"] = resp_obj
# teardown hooks
if step.teardown_hooks:
call_hooks(runner, step.teardown_hooks, step.variables, "teardown request")
call_hooks(runner, step.teardown_hooks, step_variables, "teardown request")
def log_sql_req_resp_details():
err_msg = "\n{} SQL DETAILED REQUEST & RESPONSE {}\n".format("*" * 32, "*" * 32)
@@ -152,7 +152,7 @@ def run_step_sql_request(runner: HttpRunner, step: TStep) -> StepResult:
extract_mapping = resp_obj.extract(extractors)
step_result.export_vars = extract_mapping
variables_mapping = step.variables
variables_mapping = step_variables
variables_mapping.update(extract_mapping)
# validate
@@ -167,6 +167,7 @@ def run_step_sql_request(runner: HttpRunner, step: TStep) -> StepResult:
session_data = runner.session.data
session_data.success = step_result.success
session_data.validators = resp_obj.validation_results
# save step data
step_result.data = session_data
step_result.elapsed = time.time() - start_time