GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-05-15 12:27:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

bind_variables: variable_binds now can be ordered dict

Browse Source
This commit is contained in:
httprunner
2017-09-19 18:33:27 +08:00
parent 6085dd407d
commit ccce1357c4
2 changed files with 21 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
ate/context.py
View File

@@ -54,7 +54,7 @@ class Context(object):
or config_dict.get('import_module_functions', [])
self.import_module_items(module_items, level)
variable_binds = config_dict.get('variable_binds', [])
variable_binds = config_dict.get('variable_binds', OrderedDict())
self.bind_variables(variable_binds, level)
def import_requires(self, modules):
@@ -90,32 +90,33 @@ class Context(object):
self.__update_context_functions_config(level, imported_functions_dict)
imported_variables_dict = utils.filter_module(imported_module, "variable")
variable_binds = [{key: value} for key, value in imported_variables_dict.items()]
self.bind_variables(variable_binds, level)
self.bind_variables(imported_variables_dict, level)
def bind_variables(self, variable_binds, level="testcase"):
""" bind variables to testset context or current testcase context.
variables in testset context can be used in all testcases of current test suite.
@param (list) variable_binds, variable can be value or custom function.
@param (list or OrderDict) variable_binds, variable can be value or custom function.
if value is function, it will be called and bind result to variable.
e.g.
[
{"TOKEN": "debugtalk"},
{"random": "${gen_random_string(5)}"},
{"json": {'name': 'user', 'password': '123456'}},
{"md5": "${gen_md5($TOKEN, $json, $random)}"}
]
OrderDict({
"TOKEN": "debugtalk",
"random": "${gen_random_string(5)}",
"json": {'name': 'user', 'password': '123456'},
"md5": "${gen_md5($TOKEN, $json, $random)}"
})
"""
for variable_bind in variable_binds:
for variable_name, value in variable_bind.items():
variable_evale_value = self.testcase_parser.parse_content_with_bindings(value)
if isinstance(variable_binds, list):
variable_binds = utils.convert_to_order_dict(variable_binds)
if level == "testset":
self.testset_shared_variables_mapping[variable_name] = variable_evale_value
for variable_name, value in variable_binds.items():
variable_evale_value = self.testcase_parser.parse_content_with_bindings(value)
self.testcase_variables_mapping[variable_name] = variable_evale_value
self.testcase_parser.bind_variables(self.testcase_variables_mapping)
if level == "testset":
self.testset_shared_variables_mapping[variable_name] = variable_evale_value
self.testcase_variables_mapping[variable_name] = variable_evale_value
self.testcase_parser.bind_variables(self.testcase_variables_mapping)
def __update_context_functions_config(self, level, config_mapping):
"""

16
ate/runner.py
View File

@@ -114,8 +114,8 @@ class Runner(object):
resp = self.http_client_session.request(url=url, method=method, **parsed_request)
resp_obj = response.ResponseObject(resp)
extracted_variables_mapping_list = resp_obj.extract_response(extract_binds)
self.context.bind_variables(extracted_variables_mapping_list, level="testset")
extracted_variables_mapping = resp_obj.extract_response(extract_binds)
self.context.bind_variables(extracted_variables_mapping, level="testset")
resp_obj.validate(validators, self.context.get_testcase_variables_mapping())
@@ -159,19 +159,9 @@ class Runner(object):
success = True
config_dict = testset.get("config", {})
def merge_variable_binds(variable_binds, variables_mapping):
variables_dict = OrderedDict()
for variable_dict in variable_binds:
variables_dict.update(variable_dict)
for var, value in variables_mapping.items():
variables_dict.update({var: value})
return [{var: value} for var, value in variables_dict.items()]
variable_binds = config_dict.get("variable_binds", [])
variables_mapping = variables_mapping or {}
config_dict["variable_binds"] = merge_variable_binds(variable_binds, variables_mapping)
config_dict["variable_binds"] = utils.override_variables_binds(variable_binds, variables_mapping)
self.init_config(config_dict, level="testset")
testcases = testset.get("testcases", [])