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

bugfix: keys that are not in 'request' of config shall not be lower cased

Browse Source
This commit is contained in:
debugtalk
2017-09-20 21:06:32 +08:00
parent 8d3a423e88
commit f38b63d240
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ate/runner.py
View File

@@ -51,7 +51,7 @@ class Runner(object):
@param (str) context level, testcase or testset @param (str) context level, testcase or testset
""" """
# convert keys in request headers to lowercase # convert keys in request headers to lowercase
config_dict = utils.lower_dict_key(config_dict) config_dict = utils.lower_config_dict_key(config_dict)
self.context.init_context(level) self.context.init_context(level)
self.context.config_context(config_dict, level) self.context.config_context(config_dict, level)

13
ate/utils.py
View File

@@ -300,7 +300,7 @@ def lower_dict_key(origin_dict, depth=1):
new_dict = {} new_dict = {}
for key, value in origin_dict.items(): for key, value in origin_dict.items():
if depth > 2: if depth >= 2:
new_dict[key] = value new_dict[key] = value
continue continue
@@ -311,6 +311,17 @@ def lower_dict_key(origin_dict, depth=1):
return new_dict return new_dict
def lower_config_dict_key(config_dict):
""" convert key in config dict to lower case, convertion will occur in two places:
1, all keys in config dict;
2, all keys in config["request"]
"""
config_dict = lower_dict_key(config_dict)
if "request" in config_dict and isinstance(config_dict["request"], dict):
config_dict["request"] = lower_dict_key(config_dict["request"])
return config_dict
def convert_to_order_dict(map_list): def convert_to_order_dict(map_list):
""" convert mapping in list to ordered dict """ convert mapping in list to ordered dict
@param (list) map_list @param (list) map_list

4
tests/test_utils.py
View File

@@ -222,7 +222,7 @@ class TestUtils(ApiServerUnittest):
self.assertFalse(utils.is_variable(("os", os))) self.assertFalse(utils.is_variable(("os", os)))
self.assertFalse(utils.is_variable(("utils", utils))) self.assertFalse(utils.is_variable(("utils", utils)))
def test_lower_dict_key(self): def test_handle_config_key_case(self):
origin_dict = { origin_dict = {
"Name": "test", "Name": "test",
"Request": { "Request": {
@@ -234,7 +234,7 @@ class TestUtils(ApiServerUnittest):
} }
} }
} }
new_dict = utils.lower_dict_key(origin_dict) new_dict = utils.lower_config_dict_key(origin_dict)
self.assertIn("name", new_dict) self.assertIn("name", new_dict)
self.assertIn("request", new_dict) self.assertIn("request", new_dict)
self.assertIn("method", new_dict["request"]) self.assertIn("method", new_dict["request"])