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

remove exception type: ResponseFailure

Browse Source
This commit is contained in:
httprunner
2018-07-25 16:47:55 +08:00
parent 001eed3216
commit 007cfd9d1b
4 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
httprunner/exceptions.py
View File

@@ -12,9 +12,6 @@ class MyBaseFailure(BaseException):
class ValidationFailure(MyBaseFailure): class ValidationFailure(MyBaseFailure):
pass pass
class ResponseFailure(MyBaseFailure):
pass
class ParseResponseFailure(MyBaseFailure): class ParseResponseFailure(MyBaseFailure):
pass pass

4
httprunner/runner.py
View File

@@ -183,8 +183,8 @@ class Runner(object):
validators = testcase_dict.get("validate", []) or testcase_dict.get("validators", []) validators = testcase_dict.get("validate", []) or testcase_dict.get("validators", [])
try: try:
self.context.validate(validators, resp_obj) self.context.validate(validators, resp_obj)
except (exceptions.ParamsError, exceptions.ResponseFailure, \ except (exceptions.ParamsError, \
exceptions.ValidationFailure, exceptions.ParseResponseFailure): exceptions.ValidationFailure, exceptions.ParseResponseFailure):
# 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", {}))

7
httprunner/utils.py
View File

@@ -172,7 +172,7 @@ class FileUtils(object):
def query_json(json_content, query, delimiter='.'): def query_json(json_content, query, delimiter='.'):
""" Do an xpath-like query with json_content. """ Do an xpath-like query with json_content.
@param (json_content) json_content @param (dict/list) json_content
json_content = { json_content = {
"ids": [1, 2, 3, 4], "ids": [1, 2, 3, 4],
"person": { "person": {
@@ -189,14 +189,11 @@ def query_json(json_content, query, delimiter='.'):
"person.cities.0" => "Guangzhou" "person.cities.0" => "Guangzhou"
@return queried result @return queried result
""" """
if json_content == "":
raise exceptions.ResponseFailure("response content is empty!")
try: try:
for key in query.split(delimiter): for key in query.split(delimiter):
if isinstance(json_content, list): if isinstance(json_content, list):
json_content = json_content[int(key)] json_content = json_content[int(key)]
elif isinstance(json_content, (dict, CaseInsensitiveDict)): elif isinstance(json_content, dict):
json_content = json_content[key] json_content = json_content[key]
else: else:
raise exceptions.ParseResponseFailure( raise exceptions.ParseResponseFailure(

11
tests/test_utils.py
View File

@@ -186,17 +186,6 @@ 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")
def test_query_json_content_is_text(self):
json_content = ""
query = "key"
with self.assertRaises(exceptions.ResponseFailure):
utils.query_json(json_content, query)
json_content = "<html><body>content</body></html>"
query = "key"
with self.assertRaises(exceptions.ParseResponseFailure):
utils.query_json(json_content, query)
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")