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

bugfix: extend_variables

Browse Source
This commit is contained in:
debugtalk
2018-12-28 14:29:38 +08:00
parent 611ecb5d1a
commit c1048d01a8
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
httprunner/utils.py
View File

@@ -418,10 +418,12 @@ def extend_variables(raw_variables, override_variables):
"""
if not raw_variables:
return override_variables
override_variables_mapping = ensure_mapping_format(override_variables)
return override_variables_mapping
elif not override_variables:
return raw_variables
raw_variables_mapping = ensure_mapping_format(raw_variables)
return raw_variables_mapping
else:
raw_variables_mapping = ensure_mapping_format(raw_variables)