From 0f21d7385d71d4d1a0e858d065582398cb42ab0f Mon Sep 17 00:00:00 2001 From: debugtalk Date: Sat, 24 Nov 2018 00:49:13 +0800 Subject: [PATCH] fix commit 4cf2a17cd04282f6fa09d2749452bc684bf52fdf --- httprunner/context.py | 4 ++-- tests/testcases/create_and_check.yml | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/httprunner/context.py b/httprunner/context.py index 66bb3af8..aa06663e 100644 --- a/httprunner/context.py +++ b/httprunner/context.py @@ -34,14 +34,14 @@ class SessionContext(object): """ self.test_variables_mapping = {} + self.test_variables_mapping.update(self.session_variables_mapping) + variables_mapping = variables_mapping or {} variables_mapping = utils.ensure_mapping_format(variables_mapping) for variable_name, variable_value in variables_mapping.items(): variable_value = self.eval_content(variable_value) self.update_test_variables(variable_name, variable_value) - self.test_variables_mapping.update(self.session_variables_mapping) - def update_test_variables(self, variable_name, variable_value): """ update test variables, these variables are only valid in the current test. """ diff --git a/tests/testcases/create_and_check.yml b/tests/testcases/create_and_check.yml index 1736f803..959a9da3 100644 --- a/tests/testcases/create_and_check.yml +++ b/tests/testcases/create_and_check.yml @@ -4,7 +4,6 @@ id: create_and_check variables: - uid: 9001 - - token: XXX - device_sn: "TESTCASE_CREATE_XXX" base_url: "http://127.0.0.1:5000"