GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-05-12 10:29:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

change method name

Browse Source
This commit is contained in:
debugtalk
2017-06-28 23:25:08 +08:00
parent c3d975133e
commit 207998a2f5
3 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ate/response.py
View File

@@ -9,22 +9,22 @@ class ResponseObject(object):
"""
self.resp_obj = resp_obj
def parse_response_body(self):
def parsed_body(self):
try:
return self.resp_obj.json()
except ValueError:
return self.resp_obj.text
def parse_response_object(self):
def parsed_dict(self):
return {
'status_code': self.resp_obj.status_code,
'headers': self.resp_obj.headers,
'body': self.parse_response_body()
'body': self.parsed_body()
}
def diff_response(self, expected_resp_json):
diff_content = {}
resp_info = self.parse_response_object()
resp_info = self.parsed_dict()
expected_status_code = expected_resp_json.get('status_code', 200)
if resp_info['status_code'] != int(expected_status_code):
@@ -81,7 +81,7 @@ class ResponseObject(object):
top_query, sub_query = value.split(delimiter, 1)
if top_query in ["body", "content", "text"]:
json_content = self.parse_response_body()
json_content = self.parsed_body()
else:
json_content = getattr(self.resp_obj, top_query)
@@ -98,3 +98,8 @@ class ResponseObject(object):
except AttributeError:
raise exception.ParamsError("invalid extract_binds!")
def validate(self, expected_resp_json):
diff_content = self.diff_response(expected_resp_json)
success = False if diff_content else True
return success, diff_content

4
ate/runner.py
View File

@@ -107,9 +107,7 @@ class TestRunner(object):
resp_obj = response.ResponseObject(resp)
resp_obj.extract_response(self.context)
diff_content = resp_obj.diff_response(testcase['response'])
success = False if diff_content else True
return success, diff_content
return resp_obj.validate(testcase['response'])
def run_testset(self, testset):
""" run single testset, including one or several testcases.

28
test/test_response.py
View File

@@ -9,25 +9,25 @@ class TestResponse(ApiServerUnittest):
url = "http://127.0.0.1:5000/api/users"
resp = requests.get(url)
resp_obj = response.ResponseObject(resp)
parse_result = resp_obj.parse_response_object()
self.assertIn('status_code', parse_result)
self.assertIn('headers', parse_result)
self.assertIn('body', parse_result)
self.assertIn('Content-Type', parse_result['headers'])
self.assertIn('Content-Length', parse_result['headers'])
self.assertIn('success', parse_result['body'])
parsed_dict = resp_obj.parsed_dict()
self.assertIn('status_code', parsed_dict)
self.assertIn('headers', parsed_dict)
self.assertIn('body', parsed_dict)
self.assertIn('Content-Type', parsed_dict['headers'])
self.assertIn('Content-Length', parsed_dict['headers'])
self.assertIn('success', parsed_dict['body'])
def test_parse_response_object_text(self):
url = "http://127.0.0.1:5000/"
resp = requests.get(url)
resp_obj = response.ResponseObject(resp)
parse_result = resp_obj.parse_response_object()
self.assertIn('status_code', parse_result)
self.assertIn('headers', parse_result)
self.assertIn('body', parse_result)
self.assertIn('Content-Type', parse_result['headers'])
self.assertIn('Content-Length', parse_result['headers'])
self.assertTrue(str, type(parse_result['body']))
parsed_dict = resp_obj.parsed_dict()
self.assertIn('status_code', parsed_dict)
self.assertIn('headers', parsed_dict)
self.assertIn('body', parsed_dict)
self.assertIn('Content-Type', parsed_dict['headers'])
self.assertIn('Content-Length', parsed_dict['headers'])
self.assertTrue(str, type(parsed_dict['body']))
def test_diff_response_status_code_equal(self):
status_code = random.randint(200, 511)