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

refactor: query json content

Browse Source
This commit is contained in:
httprunner
2018-07-25 17:32:12 +08:00
parent 007cfd9d1b
commit 85bb37194d
7 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
httprunner/context.py
View File

@@ -201,13 +201,8 @@ class Context(object):
# format 1/2/3 # format 1/2/3
check_value = self.eval_content(check_item) check_value = self.eval_content(check_item)
else: else:
try: # format 4/5
# format 4/5 check_value = resp_obj.extract_field(check_item)
check_value = resp_obj.extract_field(check_item)
except exceptions.ParseResponseFailure:
msg = "failed to extract check item from response!\n"
msg += "response content: {}".format(resp_obj.content)
raise exceptions.ParseResponseFailure(msg)
validator["check_value"] = check_value validator["check_value"] = check_value

2
httprunner/exceptions.py
View File

@@ -12,7 +12,7 @@ class MyBaseFailure(BaseException):
class ValidationFailure(MyBaseFailure): class ValidationFailure(MyBaseFailure):
pass pass
class ParseResponseFailure(MyBaseFailure): class ExtractFailure(MyBaseFailure):
pass pass

7
httprunner/response.py
View File

@@ -143,6 +143,9 @@ class ResponseObject(object):
if isinstance(body, (dict, list)): if isinstance(body, (dict, list)):
# content = {"xxx": 123}, content.xxx # content = {"xxx": 123}, content.xxx
return utils.query_json(body, sub_query) return utils.query_json(body, sub_query)
elif sub_query.isdigit():
# content = "abcdefg", content.3 => d
return utils.query_json(body, sub_query)
else: else:
# content = "<html>abcdefg</html>", content.xxx # content = "<html>abcdefg</html>", content.xxx
err_msg = u"ParamsError: Failed to extract attribute from response body! => {}\n".format(field) err_msg = u"ParamsError: Failed to extract attribute from response body! => {}\n".format(field)
@@ -171,8 +174,8 @@ class ResponseObject(object):
msg += "\t=> {}".format(value) msg += "\t=> {}".format(value)
logger.log_debug(msg) logger.log_debug(msg)
# TODO: unify ParseResponseFailure type # TODO: remove except here
except (exceptions.ParseResponseFailure, TypeError): except (TypeError):
logger.log_error("failed to extract field: {}".format(field)) logger.log_error("failed to extract field: {}".format(field))
raise raise

2
httprunner/runner.py
View File

@@ -184,7 +184,7 @@ class Runner(object):
try: try:
self.context.validate(validators, resp_obj) self.context.validate(validators, resp_obj)
except (exceptions.ParamsError, \ except (exceptions.ParamsError, \
exceptions.ValidationFailure, exceptions.ParseResponseFailure): exceptions.ValidationFailure, exceptions.ExtractFailure):
# log request # log request
err_req_msg = "request: \n" err_req_msg = "request: \n"
err_req_msg += "headers: {}\n".format(parsed_request.pop("headers", {})) err_req_msg += "headers: {}\n".format(parsed_request.pop("headers", {}))

18
httprunner/utils.py
View File

@@ -17,7 +17,7 @@ from datetime import datetime
import yaml import yaml
from httprunner import exceptions, logger from httprunner import exceptions, logger
from httprunner.compat import OrderedDict, is_py2, is_py3 from httprunner.compat import OrderedDict, is_py2, is_py3, str
from requests.structures import CaseInsensitiveDict from requests.structures import CaseInsensitiveDict
SECRET_KEY = "DebugTalk" SECRET_KEY = "DebugTalk"
@@ -186,20 +186,28 @@ def query_json(json_content, query, delimiter='.'):
} }
@param (str) query @param (str) query
"person.name.first_name" => "Leo" "person.name.first_name" => "Leo"
"person.name.first_name.0" => "L"
"person.cities.0" => "Guangzhou" "person.cities.0" => "Guangzhou"
@return queried result @return queried result
""" """
raise_flag = False
response_body = u"from: {}\n".format(json_content)
try: try:
for key in query.split(delimiter): for key in query.split(delimiter):
if isinstance(json_content, list): if isinstance(json_content, (list, str)):
json_content = json_content[int(key)] json_content = json_content[int(key)]
elif isinstance(json_content, dict): elif isinstance(json_content, dict):
json_content = json_content[key] json_content = json_content[key]
else: else:
raise exceptions.ParseResponseFailure( raise_flag = True
"response content is in text format! failed to query key {}!".format(key))
except (KeyError, ValueError, IndexError): except (KeyError, ValueError, IndexError):
raise exceptions.ParseResponseFailure("failed to query json when extracting response!") raise_flag = True
if raise_flag:
err_msg = u"ExtractFailure: Failed to extract! => {}\n".format(query)
err_msg += response_body
logger.log_error(err_msg)
raise exceptions.ExtractFailure(err_msg)
return json_content return json_content

6
tests/test_response.py
View File

@@ -300,7 +300,7 @@ class TestResponse(ApiServerUnittest):
] ]
resp_obj = response.ResponseObject(resp) resp_obj = response.ResponseObject(resp)
with self.assertRaises(exceptions.ParseResponseFailure): with self.assertRaises(exceptions.ExtractFailure):
resp_obj.extract_response(extract_binds_list) resp_obj.extract_response(extract_binds_list)
extract_binds_list = [ extract_binds_list = [
@@ -308,7 +308,7 @@ class TestResponse(ApiServerUnittest):
] ]
resp_obj = response.ResponseObject(resp) resp_obj = response.ResponseObject(resp)
with self.assertRaises(exceptions.ParseResponseFailure): with self.assertRaises(exceptions.ExtractFailure):
resp_obj.extract_response(extract_binds_list) resp_obj.extract_response(extract_binds_list)
def test_extract_response_json_string(self): def test_extract_response_json_string(self):
@@ -387,5 +387,5 @@ class TestResponse(ApiServerUnittest):
{"resp_content_body": "content.data.def"} {"resp_content_body": "content.data.def"}
] ]
resp_obj = response.ResponseObject(resp) resp_obj = response.ResponseObject(resp)
with self.assertRaises(exceptions.ParseResponseFailure): with self.assertRaises(exceptions.ExtractFailure):
resp_obj.extract_response(extract_binds_list) resp_obj.extract_response(extract_binds_list)

10
tests/test_utils.py
View File

@@ -163,11 +163,11 @@ class TestUtils(ApiServerUnittest):
self.assertEqual(result, 3) self.assertEqual(result, 3)
query = "ids.str_key" query = "ids.str_key"
with self.assertRaises(exceptions.ParseResponseFailure): with self.assertRaises(exceptions.ExtractFailure):
utils.query_json(json_content, query) utils.query_json(json_content, query)
query = "ids.5" query = "ids.5"
with self.assertRaises(exceptions.ParseResponseFailure): with self.assertRaises(exceptions.ExtractFailure):
utils.query_json(json_content, query) utils.query_json(json_content, query)
query = "person.age" query = "person.age"
@@ -175,7 +175,7 @@ class TestUtils(ApiServerUnittest):
self.assertEqual(result, 29) self.assertEqual(result, 29)
query = "person.not_exist_key" query = "person.not_exist_key"
with self.assertRaises(exceptions.ParseResponseFailure): with self.assertRaises(exceptions.ExtractFailure):
utils.query_json(json_content, query) utils.query_json(json_content, query)
query = "person.cities.0" query = "person.cities.0"
@@ -186,6 +186,10 @@ class TestUtils(ApiServerUnittest):
result = utils.query_json(json_content, query) result = utils.query_json(json_content, query)
self.assertEqual(result, "Leo") self.assertEqual(result, "Leo")
query = "person.name.first_name.0"
result = utils.query_json(json_content, query)
self.assertEqual(result, "L")
def test_get_uniform_comparator(self): def test_get_uniform_comparator(self):
self.assertEqual(utils.get_uniform_comparator("eq"), "equals") self.assertEqual(utils.get_uniform_comparator("eq"), "equals")
self.assertEqual(utils.get_uniform_comparator("=="), "equals") self.assertEqual(utils.get_uniform_comparator("=="), "equals")