GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-07-25 15:57:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

relocate substitute_variables_with_mapping to parse_data

Browse Source
This commit is contained in:
debugtalk
2018-08-05 22:34:09 +08:00
parent 93df1b79ba
commit acc8657a6f
5 changed files with 87 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
httprunner/loader.py
View File

@@ -5,7 +5,7 @@ import json
import os
import yaml
from httprunner import exceptions, logger, parser, utils, validator
from httprunner import exceptions, logger, parser, validator
from httprunner.compat import OrderedDict
###############################################################################
@@ -331,7 +331,7 @@ def _get_block_by_name(ref_call, ref_type):
args_mapping[item] = call_args[index]
if args_mapping:
block = utils.substitute_variables_with_mapping(block, args_mapping)
block = parser.parse_data(block, args_mapping)
return block

57
httprunner/parser.py
View File

@@ -136,6 +136,63 @@ def parse_validator(validator):
}
def parse_data(content, mapping):
""" substitute variables in content with mapping
e.g.
@params
content = {
'request': {
'url': '/api/users/$uid',
'headers': {'token': '$token'}
}
}
mapping = {"$uid": 1000}
@return
{
'request': {
'url': '/api/users/1000',
'headers': {'token': '$token'}
}
}
"""
# TODO: refactor type check
if isinstance(content, bool):
return content
if isinstance(content, (numeric_types, type)):
return content
if not content:
return content
if isinstance(content, (list, set, tuple)):
return [
parse_data(item, mapping)
for item in content
]
if isinstance(content, dict):
substituted_data = {}
for key, value in content.items():
eval_key = parse_data(key, mapping)
eval_value = parse_data(value, mapping)
substituted_data[eval_key] = eval_value
return substituted_data
# content is in string format here
for var, value in mapping.items():
if content == var:
# content is a variable
content = value
else:
if not isinstance(value, str):
value = builtin_str(value)
content = content.replace(var, value)
return content
def parse_parameters(parameters, testset_path=None):
""" parse parameters and generate cartesian product
@params

60
httprunner/utils.py
View File

@@ -15,8 +15,7 @@ import types
from datetime import datetime
from httprunner import exceptions, logger
from httprunner.compat import (OrderedDict, basestring, builtin_str, is_py2,
is_py3, numeric_types, str)
from httprunner.compat import OrderedDict, basestring, is_py2, is_py3
from requests.structures import CaseInsensitiveDict
SECRET_KEY = "DebugTalk"
@@ -87,63 +86,6 @@ def query_json(json_content, query, delimiter='.'):
return json_content
def substitute_variables_with_mapping(content, mapping):
""" substitute variables in content with mapping
e.g.
@params
content = {
'request': {
'url': '/api/users/$uid',
'headers': {'token': '$token'}
}
}
mapping = {"$uid": 1000}
@return
{
'request': {
'url': '/api/users/1000',
'headers': {'token': '$token'}
}
}
"""
# TODO: refactor type check
if isinstance(content, bool):
return content
if isinstance(content, (numeric_types, type)):
return content
if not content:
return content
if isinstance(content, (list, set, tuple)):
return [
substitute_variables_with_mapping(item, mapping)
for item in content
]
if isinstance(content, dict):
substituted_data = {}
for key, value in content.items():
eval_key = substitute_variables_with_mapping(key, mapping)
eval_value = substitute_variables_with_mapping(value, mapping)
substituted_data[eval_key] = eval_value
return substituted_data
# content is in string format here
for var, value in mapping.items():
if content == var:
# content is a variable
content = value
else:
if not isinstance(value, str):
value = builtin_str(value)
content = content.replace(var, value)
return content
def get_uniform_comparator(comparator):
""" convert comparator alias to uniform name
"""