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

Merge branch 'master' into mail

Browse Source
This commit is contained in:
httprunner
2017-08-03 12:03:49 +08:00
parent 728c379f09 bfc18b38a3
commit 053b73fc91
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ate/testcase.py
View File

@@ -37,11 +37,11 @@ def parse_variables(content, variable_mapping):
""" """
variable_name_list = get_contain_variables(content) variable_name_list = get_contain_variables(content)
for variable_name in variable_name_list: for variable_name in variable_name_list:
variable_value = variable_mapping.get(variable_name) if variable_name not in variable_mapping:
if variable_value is None:
raise ParamsError( raise ParamsError(
"%s is not defined in bind variables!" % variable_name) "%s is not defined in bind variables!" % variable_name)
variable_value = variable_mapping.get(variable_name)
if "${}".format(variable_name) == content: if "${}".format(variable_name) == content:
# content is a variable # content is a variable
content = variable_value content = variable_value

7
tests/test_testcase.py
View File

@@ -58,7 +58,8 @@ class TestcaseParserUnittest(unittest.TestCase):
"var_2": "def", "var_2": "def",
"var_3": 123, "var_3": 123,
"var_4": {"a": 1}, "var_4": {"a": 1},
"var_5": True "var_5": True,
"var_6": None
} }
self.assertEqual( self.assertEqual(
testcase.parse_variables("$var_1", variable_mapping), testcase.parse_variables("$var_1", variable_mapping),
@@ -104,6 +105,10 @@ class TestcaseParserUnittest(unittest.TestCase):
testcase.parse_variables("abc$var_4", variable_mapping), testcase.parse_variables("abc$var_4", variable_mapping),
"abc{'a': 1}" "abc{'a': 1}"
) )
self.assertEqual(
testcase.parse_variables("$var_6", variable_mapping),
None
)
def test_is_functon(self): def test_is_functon(self):
self.assertTrue(testcase.is_functon("${func()}")) self.assertTrue(testcase.is_functon("${func()}"))