mirror of
https://github.com/httprunner/httprunner.git
synced 2026-06-07 08:49:37 +08:00
fix:with_variables和extract要保留
This commit is contained in:
@@ -67,6 +67,8 @@ def call_hooks(
|
|||||||
|
|
||||||
def run_step_request(runner: HttpRunner, step: TStep) -> StepResult:
|
def run_step_request(runner: HttpRunner, step: TStep) -> StepResult:
|
||||||
"""run teststep: request"""
|
"""run teststep: request"""
|
||||||
|
logger.info("-->step start %s" % step.variables)
|
||||||
|
step_start_variables = step.variables
|
||||||
step_result = StepResult(
|
step_result = StepResult(
|
||||||
name=step.name,
|
name=step.name,
|
||||||
success=False,
|
success=False,
|
||||||
@@ -137,6 +139,7 @@ def run_step_request(runner: HttpRunner, step: TStep) -> StepResult:
|
|||||||
|
|
||||||
variables_mapping = step.variables
|
variables_mapping = step.variables
|
||||||
variables_mapping.update(extract_mapping)
|
variables_mapping.update(extract_mapping)
|
||||||
|
step_start_variables.update(extract_mapping)
|
||||||
|
|
||||||
# validate
|
# validate
|
||||||
validators = step.validators
|
validators = step.validators
|
||||||
@@ -150,7 +153,9 @@ def run_step_request(runner: HttpRunner, step: TStep) -> StepResult:
|
|||||||
session_data = runner.session.data
|
session_data = runner.session.data
|
||||||
session_data.success = step_result.success
|
session_data.success = step_result.success
|
||||||
session_data.validators = resp_obj.validation_results
|
session_data.validators = resp_obj.validation_results
|
||||||
|
logger.info("-->step end %s" % step.variables)
|
||||||
step.variables.clear()
|
step.variables.clear()
|
||||||
|
step.variables = step_start_variables
|
||||||
|
|
||||||
# save step data
|
# save step data
|
||||||
step_result.data = session_data
|
step_result.data = session_data
|
||||||
|
|||||||
@@ -44,6 +44,7 @@ def ensure_sql_ready():
|
|||||||
|
|
||||||
def run_step_sql_request(runner: HttpRunner, step: TStep) -> StepResult:
|
def run_step_sql_request(runner: HttpRunner, step: TStep) -> StepResult:
|
||||||
"""run teststep:sql request"""
|
"""run teststep:sql request"""
|
||||||
|
step_start_variables = step.variables
|
||||||
start_time = time.time()
|
start_time = time.time()
|
||||||
|
|
||||||
step_result = StepResult(
|
step_result = StepResult(
|
||||||
@@ -160,6 +161,7 @@ def run_step_sql_request(runner: HttpRunner, step: TStep) -> StepResult:
|
|||||||
session_data.success = step_result.success
|
session_data.success = step_result.success
|
||||||
session_data.validators = resp_obj.validation_results
|
session_data.validators = resp_obj.validation_results
|
||||||
step.variables.clear()
|
step.variables.clear()
|
||||||
|
step.variables = step_start_variables
|
||||||
|
|
||||||
# save step data
|
# save step data
|
||||||
step_result.data = session_data
|
step_result.data = session_data
|
||||||
|
|||||||
@@ -52,6 +52,7 @@ def ensure_thrift_ready():
|
|||||||
|
|
||||||
def run_step_thrift_request(runner: HttpRunner, step: TStep) -> StepResult:
|
def run_step_thrift_request(runner: HttpRunner, step: TStep) -> StepResult:
|
||||||
"""run teststep:thrift request"""
|
"""run teststep:thrift request"""
|
||||||
|
step_start_variables = step.variables
|
||||||
start_time = time.time()
|
start_time = time.time()
|
||||||
|
|
||||||
step_result = StepResult(
|
step_result = StepResult(
|
||||||
@@ -174,6 +175,7 @@ def run_step_thrift_request(runner: HttpRunner, step: TStep) -> StepResult:
|
|||||||
session_data.success = step_result.success
|
session_data.success = step_result.success
|
||||||
session_data.validators = resp_obj.validation_results
|
session_data.validators = resp_obj.validation_results
|
||||||
step.variables.clear()
|
step.variables.clear()
|
||||||
|
step.variables = step_start_variables
|
||||||
|
|
||||||
# save step data
|
# save step data
|
||||||
step_result.data = session_data
|
step_result.data = session_data
|
||||||
|
|||||||
Reference in New Issue
Block a user