change variable marker and function marker:

1, variable marker: ${var} => $var;
2, function marker: {'func': 'gen_random_string', 'args': [5]} => ${gen_random_string(5).
This commit is contained in:
httprunner
2017-07-04 16:45:01 +08:00
parent d941f3a3d5
commit 17bf07f012
11 changed files with 152 additions and 138 deletions

View File

@@ -7,15 +7,15 @@ register_variables:
register_template_variables:
variable_binds:
- TOKEN: "debugtalk"
- token: ${TOKEN}
- token: $TOKEN
bind_lambda_functions:
function_binds:
add_one: "lambda x: x + 1"
add_two_nums: "lambda x, y: x + y"
variable_binds:
- add1: {"func": "add_one", "args": [2]}
- sum2nums: {"func": "add_two_nums", "args": [2, 3]}
- add1: ${add_one(2)}
- sum2nums: ${add_two_nums(2, 3)}
bind_lambda_functions_with_import:
requires:
@@ -27,9 +27,9 @@ bind_lambda_functions_with_import:
gen_md5: "lambda *str_args: hashlib.md5(''.join(str_args).encode('utf-8')).hexdigest()"
variable_binds:
- TOKEN: debugtalk
- random: {"func": "gen_random_string", "args": [5]}
- random: ${gen_random_string(5)}
- data: "{'name': 'user', 'password': '123456'}"
- authorization: {"func": "gen_md5", "args": ["${TOKEN}", "${data}", "${random}"]}
- authorization: ${gen_md5($TOKEN, $data, $random)}
bind_module_functions:
function_binds:
@@ -37,6 +37,6 @@ bind_module_functions:
- test.data.custom_functions
variable_binds:
- TOKEN: debugtalk
- random: {"func": "gen_random_string", "args": [5]}
- random: ${gen_random_string(5)}
- data: "{'name': 'user', 'password': '123456'}"
- authorization: {"func": "gen_md5", "args": ["${TOKEN}", "${data}", "${random}"]}
- authorization: ${gen_md5($TOKEN, $data, $random)}