From da28cd0734869fed02a4d76b043dadf5357a07c3 Mon Sep 17 00:00:00 2001
From: "duanchao.bill" <duanchao.bill@bytedance.com>
Date: Fri, 10 Jun 2022 21:23:16 +0800
Subject: [PATCH] =?UTF-8?q?fix:with=5Fvariables=E5=92=8Cextract=E8=A6=81?=
 =?UTF-8?q?=E4=BF=9D=E7=95=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 httprunner/step_request.py        | 5 +++++
 httprunner/step_sql_request.py    | 2 ++
 httprunner/step_thrift_request.py | 2 ++
 3 files changed, 9 insertions(+)

diff --git a/httprunner/step_request.py b/httprunner/step_request.py
index 9354c9fd..68b6573b 100644
--- a/httprunner/step_request.py
+++ b/httprunner/step_request.py
@@ -67,6 +67,8 @@ def call_hooks(
 
 def run_step_request(runner: HttpRunner, step: TStep) -> StepResult:
     """run teststep: request"""
+    logger.info("-->step start %s" % step.variables)
+    step_start_variables = step.variables
     step_result = StepResult(
         name=step.name,
         success=False,
@@ -137,6 +139,7 @@ def run_step_request(runner: HttpRunner, step: TStep) -> StepResult:
 
     variables_mapping = step.variables
     variables_mapping.update(extract_mapping)
+    step_start_variables.update(extract_mapping)
 
     # validate
     validators = step.validators
@@ -150,7 +153,9 @@ def run_step_request(runner: HttpRunner, step: TStep) -> StepResult:
         session_data = runner.session.data
         session_data.success = step_result.success
         session_data.validators = resp_obj.validation_results
+        logger.info("-->step end %s" % step.variables)
         step.variables.clear()
+        step.variables = step_start_variables
 
         # save step data
         step_result.data = session_data
diff --git a/httprunner/step_sql_request.py b/httprunner/step_sql_request.py
index 55bf3179..d26d6fa6 100644
--- a/httprunner/step_sql_request.py
+++ b/httprunner/step_sql_request.py
@@ -44,6 +44,7 @@ def ensure_sql_ready():
 
 def run_step_sql_request(runner: HttpRunner, step: TStep) -> StepResult:
     """run teststep:sql request"""
+    step_start_variables = step.variables
     start_time = time.time()
 
     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.validators = resp_obj.validation_results
         step.variables.clear()
+        step.variables = step_start_variables
 
         # save step data
         step_result.data = session_data
diff --git a/httprunner/step_thrift_request.py b/httprunner/step_thrift_request.py
index b2327ba7..9425dfab 100644
--- a/httprunner/step_thrift_request.py
+++ b/httprunner/step_thrift_request.py
@@ -52,6 +52,7 @@ def ensure_thrift_ready():
 
 def run_step_thrift_request(runner: HttpRunner, step: TStep) -> StepResult:
     """run teststep:thrift request"""
+    step_start_variables = step.variables
     start_time = time.time()
 
     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.validators = resp_obj.validation_results
         step.variables.clear()
+        step.variables = step_start_variables
 
         # save step data
         step_result.data = session_data