Commit f0d64362 by taoke

Merge remote-tracking branch 'origin/master'

parents 5e791d39 81f008b5
......@@ -14,37 +14,37 @@ from common.tools import request_main
from config import BMCConfig
# @allure.feature("账号信息基本功能")
# class TestLogin():
# workBook = xlrd.open_workbook(f'{BMCConfig.root_path}/test_case_data/bmc/bmc_login_20210513.xlsx')
# @allure.story("登录")
# @allure.severity("")
# @allure.title("{inData[testPoint]}")
# @allure.testcase("{inData[yapiAddress]}")
# @allure.description("url:/auth/login 。。。。")
# @pytest.mark.parametrize("inData", get_excelData(workBook,'登录', 'login'))
# def test_login(self,inData):
# url = f"{BMCConfig().host}{inData['url']}"
# method = inData['method']
# req_data = inData['reqData']
# expectData = inData['expectData']
# headers = config.BMCConfig.loginheader
# res = request_main(url= url,headers = headers,method =method,data = req_data,has_token=True)
# assert res['code'] == expectData['code']
#
# @allure.story("激活")
# @allure.link("")
# @allure.description("/user/credit/idAuth")
# @allure.title("{inData[testPoint]}")
# @pytest.mark.parametrize("inData", get_excelData(workBook, '登录', 'Active'))
# def test_active(self,inData):
# url = f"{BMCConfig().host}{inData['url']}"
# method = inData['method']
# req_data = inData['reqData']
# expectData = inData['expectData']
# headers = config.BMCConfig.headers
# res = request_main(url=url, headers=headers, method=method, data=req_data)
# assert res['code'] == expectData['code']
@allure.feature("账号信息基本功能")
class TestLogin():
workBook = xlrd.open_workbook(f'{BMCConfig.root_path}/test_case_data/bmc/bmc_login_20210513.xlsx')
@allure.story("登录")
@allure.severity("")
@allure.title("{inData[testPoint]}")
@allure.testcase("{inData[yapiAddress]}")
@allure.description("url:/auth/login 。。。。")
@pytest.mark.parametrize("inData", get_excelData(workBook,'登录', 'login'))
def test_login(self,inData):
url = f"{BMCConfig().host}{inData['url']}"
method = inData['method']
req_data = inData['reqData']
expectData = inData['expectData']
headers = config.BMCConfig.loginheader
res = request_main(url= url,headers = headers,method =method,data = req_data,has_token=True)
assert res['code'] == expectData['code']
@allure.story("激活")
@allure.link("")
@allure.description("/user/credit/idAuth")
@allure.title("{inData[testPoint]}")
@pytest.mark.parametrize("inData", get_excelData(workBook, '登录', 'Active'))
def test_active(self,inData):
url = f"{BMCConfig().host}{inData['url']}"
method = inData['method']
req_data = inData['reqData']
expectData = inData['expectData']
headers = config.BMCConfig.headers
res = request_main(url=url, headers=headers, method=method, data=req_data)
assert res['code'] == expectData['code']
class TestRegister():
......@@ -56,45 +56,46 @@ class TestRegister():
"""数据库操作"""
self.ms = MYSQL('10.197.236.190', 3306, 'root', '123456', 'edl_public')
# @allure.story("获取用户登录类型")
# @allure.link("http://yapi.hikcreate.com/project/31/interface/api/10745")
# @allure.description("/v1/user/login/type")
# @allure.title("{inData[testPoint]}")
# @pytest.mark.flaky(reruns=2)
# @pytest.mark.parametrize("inData", get_excelData(workBook, '账号信息基本功能', 'logintypeRegister'))
# def test_login_type_register(self, inData):
# url = f"{BMCConfig().host}{inData['url']}"
# method = inData['method']
# req_data = inData['reqData']
# expectData = inData['expectData']
# headers = inData['headers']
# phone = req_data['phone']
# if not phone:
# res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
# assert res['code'] == expectData['code']
# else:
# resList = self.ms.ExecuQuery(f'SELECT * FROM edl_public.user where phone={phone};')
# if not resList: # 没有注册过
# res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
# assert res['code'] == expectData['code']
# else:
# user_id = self.resList[0]['id']
# self.ms.ExecuNonQuery(
# f'delete from edl_public.user where id={user_id};')
# @allure.story("获取图形验证码")
# @allure.link("http://yapi.hikcreate.com/project/31/interface/api/20446")
# @allure.description("/sys/captcha")
# @allure.title("{inData[testPoint]}")
# @pytest.mark.parametrize("inData", get_excelData(workBook, '账号信息基本功能', 'captchaRegister'))
# def test_login_type_register(self, inData):
# url = f"{BMCConfig().host}{inData['url']}"
# method = inData['method']
# req_data = inData['reqData']
# expectData = inData['expectData']
# headers = inData['headers']
# res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
# assert res['code'] == expectData['code']
@allure.story("获取用户登录类型")
@allure.link("http://yapi.hikcreate.com/project/31/interface/api/10745")
@allure.description("/v1/user/login/type")
@allure.title("{inData[testPoint]}")
@pytest.mark.flaky(reruns=2)
@pytest.mark.parametrize("inData", get_excelData(workBook, '账号信息基本功能', 'logintypeRegister'))
def test_login_type_register(self, inData):
url = f"{BMCConfig().host}{inData['url']}"
method = inData['method']
req_data = inData['reqData']
expectData = inData['expectData']
headers = inData['headers']
phone = req_data['phone']
if not phone:
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
assert res['code'] == expectData['code']
else:
resList = self.ms.ExecuQuery(f'SELECT * FROM edl_public.user where phone={phone};')
if resList: # 已经注册过
user_id = self.resList[0]['id']
self.ms.ExecuNonQuery(
f'delete from edl_public.user where id={user_id};')
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
@allure.story("获取图形验证码")
@allure.link("http://yapi.hikcreate.com/project/31/interface/api/20446")
@allure.description("/sys/captcha")
@allure.title("{inData[testPoint]}")
@pytest.mark.parametrize("inData", get_excelData(workBook, '账号信息基本功能', 'captchaRegister'))
def test_captcha_register(self, inData):
url = f"{BMCConfig().host}{inData['url']}"
method = inData['method']
req_data = inData['reqData']
expectData = inData['expectData']
headers = inData['headers']
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
@pytest.fixture()
def test_picture(self):
......@@ -105,23 +106,21 @@ class TestRegister():
headers = None
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
return res
# 有错误 提示图形验证码超时 -- 需要写个获取图形验证码的套件
#
@allure.story("图形短信验证码")
@allure.link("http://yapi.hikcreate.com/project/31/interface/api/10943")
@allure.description("/v1/user/login/verifyCode/detail")
@allure.title("{inData[testPoint]}")
@pytest.mark.flaky(reruns=1)
@pytest.mark.parametrize("inData", get_excelData(workBook, '账号信息基本功能', 'verifyCodedetailRegister'))
def test_login_type_register(self, inData, test_picture):
def test_verify_code_detail_register(self, inData, test_picture):
url = f"{BMCConfig().host}{inData['url']}"
method = inData['method']
req_data = inData['reqData']
expectData = inData['expectData']
headers = inData['headers']
casenum = inData['caseNum']
phone = req_data['phone']
jtId = test_picture['data']['jtId']
req_data['jtId'] = jtId
horPercent = int(RedisString(0).get(f'bmc:captcha:{jtId}'))
......@@ -132,85 +131,243 @@ class TestRegister():
req_data['horPercent'] = 1
elif casenum == 'verifyCodedetailRegister008':
req_data['jtId'] = None
elif casenum == 'verifyCodedetailRegister009' or casenum == 'verifyCodedetailRegister010':
time.sleep(60)
pass
# elif casenum == 'verifyCodedetailRegister009' or casenum == 'verifyCodedetailRegister010':
# # time.sleep(60)
# pass
if not phone:
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
print(res)
# 发送次数过多
if res['msg'] == '验证码发送次数过多,请24小时后再试':
expectData['code'] = 1006
assert res['code'] == expectData['code']
else:
resList = self.ms.ExecuQuery(f'SELECT * FROM edl_public.user where phone={phone};')
if not resList:
if resList:
user_id = resList[0]['id']
self.ms.ExecuNonQuery(
f'delete from edl_public.user where id={user_id};')
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
print(res)
allure.attach("{0}".format(res), "用例结果")
# 发送次数过多
if res['msg'] == '验证码发送次数过多,请24小时后再试':
expectData['code'] = 1006
assert res['code'] == expectData['code']
@pytest.fixture()
def test_pre_message(self):
"""请求短信验证码"""
# 获取图片验证码
url1 = f"{BMCConfig().host}/sys/captcha"
method1 = 'get'
req_data1 = {"bCityCode":"520100","bizType":"1"}
headers = None
res_picture = request_main(url=url1, headers=headers, method=method1, data=req_data1, has_token=False)
# 获取短信验证码
url = f"{BMCConfig().host}/v1/user/login/verifyCode/detail"
method = 'post'
req_data = {"phone":"15999009999","bizType":1,"horPercent":None,"jtId":None,"bCityCode":"520100","bNetTag":"trf_mgt"}
headers = None
phone = req_data['phone']
jtId = res_picture['data']['jtId']
req_data['jtId'] = jtId
horPercent = int(RedisString(0).get(f'bmc:captcha:{jtId}'))
req_data['horPercent'] = horPercent
resList = self.ms.ExecuQuery(f'SELECT * FROM edl_public.user where phone={phone};')
if resList:
user_id = resList[0]['id']
self.ms.ExecuNonQuery(
f'delete from edl_public.user where id={user_id};')
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
@allure.story("短信验证")
@allure.link("http://yapi.hikcreate.com/project/31/interface/api/10787")
@allure.description("/user/login/verifyCode")
@allure.title("{inData[testPoint]}")
@pytest.mark.flaky(reruns=1)
@pytest.mark.parametrize("inData", get_excelData(workBook, '账号信息基本功能', 'loginverifyCodeRegister'))
def test_login_verify_code_register(self, inData, test_pre_message):
url = f"{BMCConfig().host}{inData['url']}"
method = inData['method']
req_data = inData['reqData']
expectData = inData['expectData']
headers = inData['headers']
casenum = inData['caseNum']
phone = req_data['phone']
pre = test_pre_message
if not phone:
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
assert res['code'] == expectData['code']
else:
resList = self.ms.ExecuQuery(f'SELECT * FROM edl_public.user where phone={phone};')
if resList:
user_id = resList[0]['id']
self.ms.ExecuNonQuery(
f'delete from edl_public.user where id={user_id};')
if casenum == 'loginverifyCodeRegister004' or casenum == 'loginverifyCodeRegister005':
try:
verifyCode = int(RedisString(0).get(f'edl:sms_value:{phone}:MOBILE_REGISTER'))
except Exception:
expectData['code'] = 1006
else:
req_data['verifyCode'] = verifyCode
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
@pytest.fixture()
def test_pre_gesture_login(self):
"""请求令牌"""
# 获取图片验证码
picture_url = f"{BMCConfig().host}/sys/captcha"
picture_method = 'get'
picture_req_data = {"bCityCode": "520100", "bizType": "1"}
picture_headers = None
res_picture = request_main(url=picture_url, headers=picture_headers, method=picture_method, data=picture_req_data, has_token=False)
# 获取短信验证码
pic_msg_url = f"{BMCConfig().host}/v1/user/login/verifyCode/detail"
pic_msg_method = 'post'
pic_msg_req_data = {"phone": "15999099999", "bizType": 1, "horPercent": None, "jtId": None, "bCityCode": "520100",
"bNetTag": "trf_mgt"}
pic_msg_headers = None
phone = pic_msg_req_data['phone']
jtId = res_picture['data']['jtId']
pic_msg_req_data['jtId'] = jtId
horPercent = int(RedisString(0).get(f'bmc:captcha:{jtId}'))
pic_msg_req_data['horPercent'] = horPercent
resList = self.ms.ExecuQuery(f'SELECT * FROM edl_public.user where phone={phone};')
if resList:
user_id = resList[0]['id']
self.ms.ExecuNonQuery(
f'delete from edl_public.user where id={user_id};')
request_main(url=pic_msg_url, headers=pic_msg_headers, method=pic_msg_method, data=pic_msg_req_data, has_token=False)
# 短信验证
message_url = f"{BMCConfig().host}/user/login/verifyCode"
message_method = 'post'
message_req_data = {"phone":"15999099999","bizType":1,"bCityCode":"520100","bNetTag":"trf_mgt","verifyCode":""}
message_headers = None
try:
verifyCode = int(RedisString(0).get(f'edl:sms_value:{phone}:MOBILE_REGISTER'))
except Exception as e:
raise TypeError('验证码发送次数过多,请24小时后再试')
else:
message_req_data['verifyCode'] = verifyCode
res = request_main(url=message_url, headers=message_headers, method=message_method, data=message_req_data, has_token=False)
return res # {'success': True, 'code': 1000, 'msg': '操作成功', 'errorMsg': '操作成功', 'data': {'oneTimeToken': '357c8d80-e135-41a0-baae-009893f50a6e'}}
@allure.story("设置手势-登录")
@allure.link("http://yapi.hikcreate.com/project/31/interface/api/10974")
@allure.description("/v1/user/login/gesture/setAndLogin")
@allure.title("{inData[testPoint]}")
# @pytest.mark.flaky(reruns=1)
@pytest.mark.parametrize("inData", get_excelData(workBook, '账号信息基本功能', 'gesturesetAndLoginRegister'))
def test_ges_ture_set_and_login_register(self, inData, test_pre_gesture_login):
url = f"{BMCConfig().host}{inData['url']}"
method = inData['method']
req_data = inData['reqData']
expectData = inData['expectData']
headers = inData['headers']
phone = req_data['phone']
casenum = inData['caseNum']
one_time_token = test_pre_gesture_login['data']['oneTimeToken']
if not phone:
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
assert res['code'] == expectData['code']
else:
resList = self.ms.ExecuQuery(f'SELECT * FROM edl_public.user where phone={phone};')
if resList:
user_id = resList[0]['id']
self.ms.ExecuNonQuery(
f'delete from edl_public.user where id={user_id};')
if casenum >= 'gesturesetAndLoginRegister004':
req_data['oneTimeToken'] = one_time_token
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
#
@pytest.fixture()
def test_pre_pwd_login(self):
"""请求令牌"""
# 获取图片验证码
picture_url = f"{BMCConfig().host}/sys/captcha"
picture_method = 'get'
picture_req_data = {"bCityCode": "520100", "bizType": "1"}
picture_headers = None
res_picture = request_main(url=picture_url, headers=picture_headers, method=picture_method,
data=picture_req_data, has_token=False)
# 获取短信验证码
pic_msg_url = f"{BMCConfig().host}/v1/user/login/verifyCode/detail"
pic_msg_method = 'post'
pic_msg_req_data = {"phone": "15999999999", "bizType": 1, "horPercent": None, "jtId": None,
"bCityCode": "520100",
"bNetTag": "trf_mgt"}
pic_msg_headers = None
phone = pic_msg_req_data['phone']
jtId = res_picture['data']['jtId']
pic_msg_req_data['jtId'] = jtId
horPercent = int(RedisString(0).get(f'bmc:captcha:{jtId}'))
pic_msg_req_data['horPercent'] = horPercent
resList = self.ms.ExecuQuery(f'SELECT * FROM edl_public.user where phone={phone};')
if resList:
user_id = resList[0]['id']
self.ms.ExecuNonQuery(
f'delete from edl_public.user where id={user_id};')
request_main(url=pic_msg_url, headers=pic_msg_headers, method=pic_msg_method, data=pic_msg_req_data,
has_token=False)
# 短信验证
message_url = f"{BMCConfig().host}/user/login/verifyCode"
message_method = 'post'
message_req_data = {"phone": "15999999999", "bizType": 1, "bCityCode": "520100", "bNetTag": "trf_mgt",
"verifyCode": ""}
message_headers = None
try:
verifyCode = int(RedisString(0).get(f'edl:sms_value:{phone}:MOBILE_REGISTER'))
except Exception as e:
raise TypeError('验证码发送次数过多,请24小时后再试')
else:
message_req_data['verifyCode'] = verifyCode
res = request_main(url=message_url, headers=message_headers, method=message_method, data=message_req_data,
has_token=False)
return res # {'success': True, 'code': 1000, 'msg': '操作成功', 'errorMsg': '操作成功', 'data': {'oneTimeToken': '357c8d80-e135-41a0-baae-009893f50a6e'}}
@allure.story("字符密码-登录")
@allure.link("http://yapi.hikcreate.com/project/31/interface/api/11027")
@allure.description("/v1/user/login/keyboardPwd/setAndLogin")
@allure.title("{inData[testPoint]}")
@pytest.mark.parametrize("inData", get_excelData(workBook, '账号信息基本功能', 'keyboardPwdsetAndLoginRegister'))
def test_keyboard_pwd_set_and_login_register(self, inData, test_pre_pwd_login):
url = f"{BMCConfig().host}{inData['url']}"
method = inData['method']
req_data = inData['reqData']
expectData = inData['expectData']
headers = inData['headers']
phone = req_data['phone']
casenum = inData['caseNum']
one_time_token = test_pre_pwd_login['data']['oneTimeToken']
if not phone:
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
assert res['code'] == expectData['code']
else:
resList = self.ms.ExecuQuery(f'SELECT * FROM edl_public.user where phone={phone};')
if resList:
user_id = resList[0]['id']
self.ms.ExecuNonQuery(
f'delete from edl_public.user where id={user_id};')
if casenum >= 'keyboardPwdsetAndLoginRegister004':
req_data['oneTimeToken'] = one_time_token
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
# 有问题 -- 写个套件 获取短信验证码
# @allure.story("短信验证")
# @allure.link("http://yapi.hikcreate.com/project/31/interface/api/10787")
# @allure.description("/user/login/verifyCode")
# @allure.title("{inData[testPoint]}")
# @pytest.mark.parametrize("inData", get_excelData(workBook, '账号信息基本功能', 'loginverifyCodeRegister'))
# def test_login_type_register(self, inData):
# url = f"{BMCConfig().host}{inData['url']}"
# method = inData['method']
# req_data = inData['reqData']
# expectData = inData['expectData']
# headers = inData['headers']
# phone = req_data['phone']
# if not phone:
# res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
# assert res['code'] == expectData['code']
# else:
# resList = self.ms.ExecuQuery(f'SELECT * FROM edl_public.user where phone={phone};')
# if not resList:
# res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
# assert res['code'] == expectData['code']
# else:
# user_id = resList[0]['id']
# self.ms.ExecuNonQuery(
# f'delete from edl_public.user where id={user_id};')
# @allure.story("设置手势-登录")
# @allure.link("http://yapi.hikcreate.com/project/31/interface/api/10974")
# @allure.description("/v1/user/login/gesture/setAndLogin")
# @allure.title("{inData[testPoint]}")
# @pytest.mark.flaky(reruns=2)
# @pytest.mark.parametrize("inData", get_excelData(workBook, '账号信息基本功能', 'gesturesetAndLoginRegister'))
# def test_login_type_register(self, inData):
# url = f"{BMCConfig().host}{inData['url']}"
# method = inData['method']
# req_data = inData['reqData']
# expectData = inData['expectData']
# headers = inData['headers']
# phone = req_data['phone']
# if not phone:
# res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
# assert res['code'] == expectData['code']
# else:
# resList = self.ms.ExecuQuery(f'SELECT * FROM edl_public.user where phone={phone};')
# if not resList:
# res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
# assert res['code'] == expectData['code']
# else:
# user_id = resList[0]['id']
# self.ms.ExecuNonQuery(
# f'delete from edl_public.user where id={user_id};')
if __name__ == '__main__':
pytest.main(['-s', '-v', 'test_accountinfo.py',
r'--alluredir=D:\项目\接口自动化\InterfaceAutoTest\report', '--clean-alluredir'])
#
# os.system('allure serve D:\项目\接口自动化\InterfaceAutoTest\\report')
os.system('allure serve D:\项目\接口自动化\InterfaceAutoTest\\report')
......@@ -26,6 +26,7 @@ class TestCreditScore():
expectData = inData['expectData']
headers = inData['headers']
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
@allure.story("分享信用分")
......@@ -40,6 +41,7 @@ class TestCreditScore():
expectData = inData['expectData']
headers = inData['headers']
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
@allure.story("历史信用分")
......@@ -54,6 +56,7 @@ class TestCreditScore():
expectData = inData['expectData']
headers = inData['headers']
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
@allure.story("完善基础信息")
......@@ -68,6 +71,7 @@ class TestCreditScore():
expectData = inData['expectData']
headers = inData['headers']
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
@allure.story("获取履约任务")
......@@ -82,6 +86,7 @@ class TestCreditScore():
expectData = inData['expectData']
headers = inData['headers']
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
@allure.story("身份证信息")
......@@ -96,6 +101,7 @@ class TestCreditScore():
expectData = inData['expectData']
headers = inData['headers']
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
@allure.story("驾驶证信息")
......@@ -110,6 +116,7 @@ class TestCreditScore():
expectData = inData['expectData']
headers = inData['headers']
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
@allure.story("身份证信息正反面")
......@@ -124,6 +131,7 @@ class TestCreditScore():
expectData = inData['expectData']
headers = inData['headers']
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
@allure.story("车辆列表")
......@@ -138,6 +146,7 @@ class TestCreditScore():
expectData = inData['expectData']
headers = inData['headers']
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
@allure.story("我的学历信息")
......@@ -152,6 +161,7 @@ class TestCreditScore():
expectData = inData['expectData']
headers = inData['headers']
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
@allure.story("我的单位信息")
......@@ -166,6 +176,7 @@ class TestCreditScore():
expectData = inData['expectData']
headers = inData['headers']
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
@allure.story("我的车辆信息")
......@@ -180,6 +191,7 @@ class TestCreditScore():
expectData = inData['expectData']
headers = inData['headers']
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
@allure.story("学历认证地区选择")
......@@ -194,6 +206,7 @@ class TestCreditScore():
expectData = inData['expectData']
headers = inData['headers']
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
@allure.story("学历单位选择")
......@@ -208,6 +221,7 @@ class TestCreditScore():
expectData = inData['expectData']
headers = inData['headers']
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
@pytest.fixture()
......@@ -239,6 +253,7 @@ class TestCreditScore():
expectData['code'] = 1006
else:
expectData['code'] = 1000
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
@allure.story("删除学历")
......@@ -256,6 +271,7 @@ class TestCreditScore():
headers = inData['headers']
req_data['id'] = education_list[0]['id']
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
@allure.story("新增单位")
......@@ -278,6 +294,7 @@ class TestCreditScore():
expectData['code'] = 1006
else:
expectData['code'] = 1000
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
@pytest.fixture()
......@@ -305,6 +322,7 @@ class TestCreditScore():
headers = inData['headers']
req_data['id'] = work_id
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
@allure.story("驾驶证年审")
......@@ -319,6 +337,7 @@ class TestCreditScore():
expectData = inData['expectData']
headers = inData['headers']
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
@allure.story("更换驾驶证本人照片")
......@@ -333,6 +352,7 @@ class TestCreditScore():
expectData = inData['expectData']
headers = inData['headers']
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
@allure.story("期满换证信息")
......@@ -347,6 +367,7 @@ class TestCreditScore():
expectData = inData['expectData']
headers = inData['headers']
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
@allure.story("车辆年检信息")
......@@ -361,6 +382,7 @@ class TestCreditScore():
expectData = inData['expectData']
headers = inData['headers']
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
@allure.story("添加车辆失败")
......@@ -375,6 +397,7 @@ class TestCreditScore():
expectData = inData['expectData']
headers = inData['headers']
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
......
......@@ -40,6 +40,7 @@ class TestIllegalStudy():
else:
expectData['code'] = 1000
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
@allure.story("获取典型案例视频")
......@@ -54,6 +55,7 @@ class TestIllegalStudy():
expectData = inData['expectData']
headers = inData['headers']
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
@allure.story("获取试卷")
......@@ -68,6 +70,7 @@ class TestIllegalStudy():
expectData = inData['expectData']
headers = inData['headers']
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
@pytest.fixture()
......@@ -135,6 +138,7 @@ class TestIllegalStudy():
req_data['topicId'] = choosequestion['topicId']
res = request_main(url=url, headers=None, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
@allure.story("查询成绩(只有错题)")
......@@ -149,6 +153,7 @@ class TestIllegalStudy():
expectData = inData['expectData']
headers = inData['headers']
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
@allure.story("查询答题记录列表")
......@@ -163,7 +168,7 @@ class TestIllegalStudy():
expectData = inData['expectData']
headers = inData['headers']
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
print(res)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
@allure.story("答题记录查询")
......@@ -178,6 +183,7 @@ class TestIllegalStudy():
expectData = inData['expectData']
headers = inData['headers']
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
if __name__ == '__main__':
......
......@@ -24,6 +24,7 @@ class TestIntegral():
expectData = inData['expectData']
headers = inData['headers']
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
@allure.story("查询我的签到情况")
......@@ -38,8 +39,8 @@ class TestIntegral():
expectData = inData['expectData']
headers = inData['headers']
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
return res['data']['canSignInToday']
@pytest.fixture()
def test_pre_get_sign_integral(self):
......@@ -65,6 +66,7 @@ class TestIntegral():
headers = inData['headers']
other_expected_data = inData['otherExpectData']
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
if not test_pre_get_sign_integral: # 已经签到过
assert res['code'] == other_expected_data['code']
else:
......@@ -82,6 +84,7 @@ class TestIntegral():
expectData = inData['expectData']
headers = inData['headers']
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
@allure.story("查询积分商品")
......@@ -96,6 +99,7 @@ class TestIntegral():
expectData = inData['expectData']
headers = inData['headers']
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
@allure.story("查询积分规则")
......@@ -110,6 +114,7 @@ class TestIntegral():
expectData = inData['expectData']
headers = inData['headers']
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
@allure.story("设置签到提醒开关")
......@@ -124,6 +129,7 @@ class TestIntegral():
expectData = inData['expectData']
headers = inData['headers']
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
@allure.story("任务中心主页")
......@@ -138,6 +144,7 @@ class TestIntegral():
expectData = inData['expectData']
headers = inData['headers']
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
@pytest.fixture()
......@@ -176,6 +183,7 @@ class TestIntegral():
else:
break
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
@allure.story("获取关注信息")
......@@ -190,6 +198,7 @@ class TestIntegral():
expectData = inData['expectData']
headers = inData['headers']
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
@allure.story("商城中的商品")
......@@ -204,6 +213,7 @@ class TestIntegral():
expectData = inData['expectData']
headers = inData['headers']
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
@allure.story("商品的详情")
......@@ -218,6 +228,7 @@ class TestIntegral():
expectData = inData['expectData']
headers = inData['headers']
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
@pytest.fixture()
......@@ -228,6 +239,7 @@ class TestIntegral():
req_data = {"pageSize":"20","pageIndex":"1","sortType":"0"}
headers = None
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
return res['data']
@allure.story("兑换商品接口")
......@@ -256,6 +268,7 @@ class TestIntegral():
else:
expectData['code'] = 1006
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
@allure.story("查询商品的适用门店列表")
......@@ -270,6 +283,7 @@ class TestIntegral():
expectData = inData['expectData']
headers = inData['headers']
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
@allure.story("查询兑换记录")
......@@ -284,6 +298,7 @@ class TestIntegral():
expectData = inData['expectData']
headers = inData['headers']
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
@allure.story("查询兑换记录详情")
......@@ -298,6 +313,7 @@ class TestIntegral():
expectData = inData['expectData']
headers = inData['headers']
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
@allure.story("关注成功回调")
......@@ -312,6 +328,7 @@ class TestIntegral():
expectData = inData['expectData']
headers = inData['headers']
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
......
......@@ -63,6 +63,7 @@ class TestVehicleSteward():
is_auth = test_pre_info['data']['auth']
except Exception as e:
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
setattr(TestVehicleSteward, 'gasLog', res['data']['gasLog'])
setattr(TestVehicleSteward, 'trafficFine', res['data']['trafficFine'])
assert res['code'] == expectData['code']
......@@ -94,6 +95,7 @@ class TestVehicleSteward():
elif self.gasLog:
req_data['gasLog'] = False
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
else:
pytest.skip(msg="未开启授权,跳过此用例")
......@@ -110,6 +112,7 @@ class TestVehicleSteward():
expectData = inData['expectData']
headers = inData['headers']
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
@allure.story("更改自动记账")
......@@ -136,6 +139,7 @@ class TestVehicleSteward():
elif self.gasLog:
req_data['trafficFine'] = False
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
else:
pytest.skip(msg="未开启授权,跳过此用例")
......@@ -155,6 +159,7 @@ class TestVehicleSteward():
is_auth = test_pre_info['data']['auth']
except Exception as e:
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
else:
pytest.skip(msg="未开启授权,跳过此用例")
......@@ -171,6 +176,7 @@ class TestVehicleSteward():
expectData = inData['expectData']
headers = inData['headers']
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
@allure.story("自动记账授权")
......@@ -193,6 +199,7 @@ class TestVehicleSteward():
else:
url = f"{BMCConfig().host}/vehicle/steward/authorization/agree"
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code']
except Exception as e:
# 清除记录 重新执行此用例
......
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