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

move response relevant code to ate/response.py

Browse Source
This commit is contained in:
debugtalk
2017-06-28 15:29:40 +08:00
parent fbb7df5826
commit 4250992ad9
5 changed files with 267 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
ate/response.py Normal file
View File

@@ -0,0 +1,53 @@
from ate import utils
def parse_response_object(resp_obj):
try:
resp_body = resp_obj.json()
except ValueError:
resp_body = resp_obj.text
return {
'status_code': resp_obj.status_code,
'headers': resp_obj.headers,
'body': resp_body
}
def diff_response(resp_obj, expected_resp_json):
diff_content = {}
resp_info = parse_response_object(resp_obj)
expected_status_code = expected_resp_json.get('status_code', 200)
if resp_info['status_code'] != int(expected_status_code):
diff_content['status_code'] = {
'value': resp_info['status_code'],
'expected': expected_status_code
}
expected_headers = expected_resp_json.get('headers', {})
headers_diff = utils.diff_json(resp_info['headers'], expected_headers)
if headers_diff:
diff_content['headers'] = headers_diff
expected_body = expected_resp_json.get('body', None)
if expected_body is None:
body_diff = {}
elif type(expected_body) != type(resp_info['body']):
body_diff = {
'value': resp_info['body'],
'expected': expected_body
}
elif isinstance(expected_body, str):
if expected_body != resp_info['body']:
body_diff = {
'value': resp_info['body'],
'expected': expected_body
}
elif isinstance(expected_body, dict):
body_diff = utils.diff_json(resp_info['body'], expected_body)
if body_diff:
diff_content['body'] = body_diff
return diff_content

4
ate/runner.py
View File

@@ -1,6 +1,6 @@
import requests
from ate import exception, utils
from ate import exception, response
from ate.context import Context
from ate.testcase import TestcaseParser
@@ -101,7 +101,7 @@ class TestRunner(object):
raise exception.ParamsError("URL or METHOD missed!")
resp_obj = self.client.request(url=url, method=method, **req_kwargs)
diff_content = utils.diff_response(resp_obj, testcase['response'])
diff_content = response.diff_response(resp_obj, testcase['response'])
success = False if diff_content else True
return success, diff_content

51
ate/utils.py
View File

@@ -62,18 +62,6 @@ def load_testcases(testcase_file_path):
# '' or other suffix
raise ParamsError("Bad testcase file name!")
def parse_response_object(resp_obj):
try:
resp_body = resp_obj.json()
except ValueError:
resp_body = resp_obj.text
return {
'status_code': resp_obj.status_code,
'headers': resp_obj.headers,
'body': resp_body
}
def diff_json(current_json, expected_json):
json_diff = {}
@@ -87,45 +75,6 @@ def diff_json(current_json, expected_json):
return json_diff
def diff_response(resp_obj, expected_resp_json):
diff_content = {}
resp_info = parse_response_object(resp_obj)
expected_status_code = expected_resp_json.get('status_code', 200)
if resp_info['status_code'] != int(expected_status_code):
diff_content['status_code'] = {
'value': resp_info['status_code'],
'expected': expected_status_code
}
expected_headers = expected_resp_json.get('headers', {})
headers_diff = diff_json(resp_info['headers'], expected_headers)
if headers_diff:
diff_content['headers'] = headers_diff
expected_body = expected_resp_json.get('body', None)
if expected_body is None:
body_diff = {}
elif type(expected_body) != type(resp_info['body']):
body_diff = {
'value': resp_info['body'],
'expected': expected_body
}
elif isinstance(expected_body, str):
if expected_body != resp_info['body']:
body_diff = {
'value': resp_info['body'],
'expected': expected_body
}
elif isinstance(expected_body, dict):
body_diff = diff_json(resp_info['body'], expected_body)
if body_diff:
diff_content['body'] = body_diff
return diff_content
def load_foler_files(folder_path):
""" load folder path, return all files in list format.
"""