Commit c643af63 by fanxun

Merge remote-tracking branch 'origin/master'

parents 1415c1d3 62d46d13
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
import json import json
import logging import logging
import requests import requests,allure
from config import * from config import *
...@@ -19,11 +19,17 @@ def request_main(url, headers, method, data, has_token=False): ...@@ -19,11 +19,17 @@ def request_main(url, headers, method, data, has_token=False):
try: try:
if method.upper() == "GET": if method.upper() == "GET":
allure.attach(f"{headers}", "请求头", allure.attachment_type.TEXT)
allure.attach(f"{data}", "请求参数", allure.attachment_type.TEXT)
inner_res = requests.get(url=url, headers=headers, params=data) inner_res = requests.get(url=url, headers=headers, params=data)
elif method.upper() == "POST": elif method.upper() == "POST":
if header_content_type == "application/json": if header_content_type == "application/json":
allure.attach(f"{headers}", "请求头", allure.attachment_type.TEXT)
allure.attach(f"{data}", "请求参数", allure.attachment_type.TEXT)
inner_res = requests.post(url=url, headers=headers, json=data) inner_res = requests.post(url=url, headers=headers, json=data)
elif header_content_type in ["application/x-www-form-urlencoded"]: elif header_content_type in ["application/x-www-form-urlencoded"]:
allure.attach(f"{headers}", "请求头", allure.attachment_type.TEXT)
allure.attach(f"{data}", "请求参数", allure.attachment_type.TEXT)
inner_res = requests.post(url=url, headers=headers, data=data) inner_res = requests.post(url=url, headers=headers, data=data)
return inner_res return inner_res
except Exception as e: except Exception as e:
......
...@@ -70,7 +70,7 @@ class TestDrivingLicense(): ...@@ -70,7 +70,7 @@ class TestDrivingLicense():
headers = inData['headers'] headers = inData['headers']
"""请求""" """请求"""
res = request_main(url, headers, method, req_data) res = request_main(url, headers, method, req_data)
allure.attach("{0}".format(res), "用例结果") allure.attach(f"{res}", "响应结果", allure.attachment_type.TEXT)
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
@allure.story("获取驾驶证图片状态") @allure.story("获取驾驶证图片状态")
...@@ -86,7 +86,7 @@ class TestDrivingLicense(): ...@@ -86,7 +86,7 @@ class TestDrivingLicense():
headers = inData['headers'] headers = inData['headers']
"""请求""" """请求"""
res = request_main(url, headers, method, req_data) res = request_main(url, headers, method, req_data)
allure.attach( "{0}".format(res),"用例结果") allure.attach(f"{res}", "响应结果", allure.attachment_type.TEXT)
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
@pytest.mark.usefixtures("imaAuditStatus") @pytest.mark.usefixtures("imaAuditStatus")
...@@ -103,7 +103,7 @@ class TestDrivingLicense(): ...@@ -103,7 +103,7 @@ class TestDrivingLicense():
headers = inData['headers'] headers = inData['headers']
"""请求""" """请求"""
res = request_main(url, headers, method, req_data) res = request_main(url, headers, method, req_data)
allure.attach( "{0}".format(res),"用例结果") allure.attach(f"{res}", "响应结果", allure.attachment_type.TEXT)
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
@allure.story("图像上传页文案") @allure.story("图像上传页文案")
...@@ -119,7 +119,7 @@ class TestDrivingLicense(): ...@@ -119,7 +119,7 @@ class TestDrivingLicense():
headers = inData['headers'] headers = inData['headers']
"""请求""" """请求"""
res = request_main(url, headers, method, req_data) res = request_main(url, headers, method, req_data)
allure.attach( "{0}".format(res),"用例结果") allure.attach(f"{res}", "响应结果", allure.attachment_type.TEXT)
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
...@@ -137,7 +137,7 @@ class TestDrivingLicense(): ...@@ -137,7 +137,7 @@ class TestDrivingLicense():
headers = inData['headers'] headers = inData['headers']
"""请求""" """请求"""
res = request_main(url, headers, method, req_data) res = request_main(url, headers, method, req_data)
allure.attach( "{0}".format(res),"用例结果") allure.attach(f"{res}", "响应结果", allure.attachment_type.TEXT)
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
...@@ -154,7 +154,7 @@ class TestDrivingLicense(): ...@@ -154,7 +154,7 @@ class TestDrivingLicense():
headers = inData['headers'] headers = inData['headers']
"""请求""" """请求"""
res = request_main(url, headers, method, req_data) res = request_main(url, headers, method, req_data)
allure.attach( "{0}".format(res),"用例结果") allure.attach(f"{res}", "响应结果", allure.attachment_type.TEXT)
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
@allure.story("驾驶证图片接口") @allure.story("驾驶证图片接口")
...@@ -188,7 +188,7 @@ class TestDrivingLicense(): ...@@ -188,7 +188,7 @@ class TestDrivingLicense():
headers = inData['headers'] headers = inData['headers']
"""请求""" """请求"""
res = request_main(url, headers, method, req_data) res = request_main(url, headers, method, req_data)
allure.attach("{0}".format(res), "用例结果") allure.attach(f"{res}", "响应结果", allure.attachment_type.TEXT)
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
...@@ -215,7 +215,7 @@ class TestDrivingLicense(): ...@@ -215,7 +215,7 @@ class TestDrivingLicense():
"""请求""" """请求"""
res = request_main(url, headers, method, req_data,has_token=True) res = request_main(url, headers, method, req_data,has_token=True)
allure.attach( "{0}".format(res),"用例结果") allure.attach(f"{res}", "响应结果", allure.attachment_type.TEXT)
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
"""把其他某个用例做为初始化,这种方式还需讨论,暂时不行""" """把其他某个用例做为初始化,这种方式还需讨论,暂时不行"""
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment