fix: handle the case when variable_binds is OrderedDict or some other data structure

This commit is contained in:
httprunner
2017-09-20 22:14:52 +08:00
parent ffed8c38a2
commit 0ac4ed4bc8
2 changed files with 28 additions and 3 deletions

View File

@@ -366,8 +366,15 @@ def update_ordered_dict(ordered_dict, override_mapping):
def override_variables_binds(variable_binds, new_mapping):
""" convert variable_binds in testcase to ordered mapping, with new_mapping overrided
"""
if isinstance(variable_binds, list):
variable_binds_ordered_dict = convert_to_order_dict(variable_binds)
elif isinstance(variable_binds, OrderedDict):
variable_binds_ordered_dict = variable_binds
else:
raise exception.ParamsError("variable_binds error!")
return update_ordered_dict(
convert_to_order_dict(variable_binds),
variable_binds_ordered_dict,
new_mapping
)