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

bugfix random function in config variables run many times

Browse Source
This commit is contained in:
hluguoj
2019-02-21 20:13:53 +08:00
parent 2dae1e4dda
commit fb091079a4
6 changed files with 49 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
httprunner/parser.py
View File

@@ -506,7 +506,7 @@ def parse_string_variables(content, variables_mapping, functions_mapping):
functions_mapping, functions_mapping,
raise_if_variable_not_found=False raise_if_variable_not_found=False
) )
variables_mapping[variable_name] = parsed_variable_value
# TODO: replace variable label from $var to {{var}} # TODO: replace variable label from $var to {{var}}
if "${}".format(variable_name) == content: if "${}".format(variable_name) == content:
# content is a variable # content is a variable
@@ -759,13 +759,15 @@ def __parse_config(config, project_mapping):
# parse config variables # parse config variables
parsed_config_variables = {} parsed_config_variables = {}
for key, value in raw_config_variables_mapping.items():
for key in raw_config_variables_mapping:
parsed_value = parse_data( parsed_value = parse_data(
value, raw_config_variables_mapping[key],
raw_config_variables_mapping, raw_config_variables_mapping,
functions, functions,
raise_if_variable_not_found=False raise_if_variable_not_found=False
) )
raw_config_variables_mapping[key] = parsed_value
parsed_config_variables[key] = parsed_value parsed_config_variables[key] = parsed_value
if parsed_config_variables: if parsed_config_variables:
@@ -823,12 +825,22 @@ def __parse_testcase_tests(tests, config, project_mapping):
test_dict.pop("variables", {}), test_dict.pop("variables", {}),
config_variables config_variables
) )
test_dict["variables"] = parse_data(
test_dict["variables"], for key in test_dict["variables"]:
test_dict["variables"], parsed_key = parse_data(
functions, key,
raise_if_variable_not_found=False test_dict["variables"],
) functions,
raise_if_variable_not_found=False
)
parsed_value = parse_data(
test_dict["variables"][key],
test_dict["variables"],
functions,
raise_if_variable_not_found=False
)
if parsed_key in test_dict["variables"]:
test_dict["variables"][parsed_key] = parsed_value
# parse test_dict name # parse test_dict name
test_dict["name"] = parse_data( test_dict["name"] = parse_data(
@@ -974,15 +986,17 @@ def __get_parsed_testsuite_testcases(testcases, testsuite_config, project_mappin
# parse config variables # parse config variables
parsed_config_variables = {} parsed_config_variables = {}
for key, value in parsed_testcase_config_variables.items():
for key in parsed_testcase_config_variables:
try: try:
parsed_value = parse_data( parsed_value = parse_data(
value, parsed_testcase_config_variables[key],
parsed_testcase_config_variables, parsed_testcase_config_variables,
functions functions
) )
except exceptions.VariableNotFound: except exceptions.VariableNotFound:
pass pass
parsed_testcase_config_variables[key] = parsed_value
parsed_config_variables[key] = parsed_value parsed_config_variables[key] = parsed_value
if parsed_config_variables: if parsed_config_variables:

2
tests/data/demo_testcase.yml
View File

@@ -3,6 +3,8 @@
variables: variables:
var_a: 0 var_a: 0
var_c: "${sum_two(1, 2)}" var_c: "${sum_two(1, 2)}"
var_d: "${gen_random_string(5)}"
var_e: $var_d
PROJECT_KEY: ${ENV(PROJECT_KEY)} PROJECT_KEY: ${ENV(PROJECT_KEY)}
# parameters: # parameters:
# - "var_a-var_b": # - "var_a-var_b":

3
tests/test_api.py
View File

@@ -598,6 +598,9 @@ class TestApi(ApiServerUnittest):
testcase1 = parsed_testcases[0]["teststeps"][0] testcase1 = parsed_testcases[0]["teststeps"][0]
self.assertIn("setup and reset all (override)", testcase1["config"]["name"]) self.assertIn("setup and reset all (override)", testcase1["config"]["name"])
self.assertEqual(testcase1["teststeps"][0]["variables"]["var_c"], testcase1["teststeps"][0]["variables"]["var_d"])
self.assertEqual(testcase1["teststeps"][0]["variables"]["var_a"], testcase1["teststeps"][0]["variables"]["var_b"])
self.assertNotEqual(testcase1["teststeps"][0]["variables"]["var_a"], testcase1["teststeps"][0]["variables"]["var_c"])
self.assertNotIn("testcase_def", testcase1) self.assertNotIn("testcase_def", testcase1)
self.assertEqual(len(testcase1["teststeps"]), 2) self.assertEqual(len(testcase1["teststeps"]), 2)
self.assertEqual( self.assertEqual(

4
tests/test_loader.py
View File

@@ -394,8 +394,8 @@ class TestSuiteLoader(unittest.TestCase):
testsuites_list[0]["config"]["name"] testsuites_list[0]["config"]["name"]
) )
self.assertEqual( self.assertEqual(
{'device_sn': '${gen_random_string(15)}'}, '${gen_random_string(15)}',
testsuites_list[0]["config"]["variables"] testsuites_list[0]["config"]["variables"]['device_sn']
) )
self.assertIn( self.assertIn(
"create user 1000 and check result.", "create user 1000 and check result.",

15
tests/test_parser.py
View File

@@ -452,6 +452,7 @@ class TestParser(unittest.TestCase):
test_dict1 = parsed_testcases[0]["teststeps"][0] test_dict1 = parsed_testcases[0]["teststeps"][0]
self.assertEqual(test_dict1["variables"]["var_c"], 3) self.assertEqual(test_dict1["variables"]["var_c"], 3)
self.assertEqual(test_dict1["variables"]["PROJECT_KEY"], "ABCDEFGH") self.assertEqual(test_dict1["variables"]["PROJECT_KEY"], "ABCDEFGH")
self.assertEqual(test_dict1["variables"]["var_d"], test_dict1["variables"]["var_e"])
# TODO: parameters # TODO: parameters
# self.assertEqual(len(parsed_testcases), 2 * 2) # self.assertEqual(len(parsed_testcases), 2 * 2)
self.assertEqual(parsed_testcases[0]["config"]["name"], '1230') self.assertEqual(parsed_testcases[0]["config"]["name"], '1230')
@@ -612,11 +613,12 @@ class TestParser(unittest.TestCase):
self.assertEqual(parsed_testcase["num4"], "${sum_two($num0, 5)}") self.assertEqual(parsed_testcase["num4"], "${sum_two($num0, 5)}")
def test_parse_tests_variable_with_function(self): def test_parse_tests_variable_with_function(self):
from tests.debugtalk import sum_two from tests.debugtalk import sum_two, gen_random_string
tests_mapping = { tests_mapping = {
"project_mapping": { "project_mapping": {
"functions": { "functions": {
"sum_two": sum_two "sum_two": sum_two,
"gen_random_string": gen_random_string
} }
}, },
'testcases': [ 'testcases': [
@@ -625,7 +627,9 @@ class TestParser(unittest.TestCase):
'name': '', 'name': '',
"base_url": "$host1", "base_url": "$host1",
'variables': { 'variables': {
"host1": "https://debugtalk.com" "host1": "https://debugtalk.com",
"var_a": "${gen_random_string(5)}",
"var_b": "$var_a"
} }
}, },
"teststeps": [ "teststeps": [
@@ -636,7 +640,9 @@ class TestParser(unittest.TestCase):
"host2": "https://httprunner.org", "host2": "https://httprunner.org",
"num3": "${sum_two($num2, 4)}", "num3": "${sum_two($num2, 4)}",
"num2": "${sum_two($num1, 3)}", "num2": "${sum_two($num1, 3)}",
"num1": "${sum_two(1, 2)}" "num1": "${sum_two(1, 2)}",
"str1": "${gen_random_string(5)}",
"str2": "$str1"
}, },
'request': { 'request': {
'url': '/api1/?num1=$num1&num2=$num2&num3=$num3', 'url': '/api1/?num1=$num1&num2=$num2&num3=$num3',
@@ -651,6 +657,7 @@ class TestParser(unittest.TestCase):
test_dict = parsed_tests_mapping["testcases"][0]["teststeps"][0] test_dict = parsed_tests_mapping["testcases"][0]["teststeps"][0]
self.assertEqual(test_dict["variables"]["num3"], 10) self.assertEqual(test_dict["variables"]["num3"], 10)
self.assertEqual(test_dict["variables"]["num2"], 6) self.assertEqual(test_dict["variables"]["num2"], 6)
self.assertEqual(test_dict["variables"]["str1"], test_dict["variables"]["str2"])
self.assertEqual( self.assertEqual(
test_dict["request"]["url"], test_dict["request"]["url"],
"https://httprunner.org/api1/?num1=3&num2=6&num3=10" "https://httprunner.org/api1/?num1=3&num2=6&num3=10"

6
tests/testsuites/create_users.yml
View File

@@ -2,6 +2,8 @@ config:
name: create users with uid name: create users with uid
variables: variables:
device_sn: ${gen_random_string(15)} device_sn: ${gen_random_string(15)}
var_a: ${gen_random_string(5)}
var_b: $var_a
base_url: "http://127.0.0.1:5000" base_url: "http://127.0.0.1:5000"
testcases: testcases:
@@ -9,8 +11,12 @@ testcases:
testcase: testcases/create_and_check.yml testcase: testcases/create_and_check.yml
variables: variables:
uid: 1000 uid: 1000
var_c: ${gen_random_string(5)}
var_d: $var_c
create user 1001 and check result.: create user 1001 and check result.:
testcase: testcases/create_and_check.yml testcase: testcases/create_and_check.yml
variables: variables:
uid: 1001 uid: 1001
var_c: ${gen_random_string(5)}
var_d: $var_c