Commit 6bf62eeb by fanxun

兼容发送时间间隔

parent c643af63
...@@ -14,37 +14,37 @@ from common.tools import request_main ...@@ -14,37 +14,37 @@ from common.tools import request_main
from config import BMCConfig from config import BMCConfig
@allure.feature("账号信息基本功能") # @allure.feature("账号信息基本功能")
class TestLogin(): # class TestLogin():
workBook = xlrd.open_workbook(f'{BMCConfig.root_path}/test_case_data/bmc/bmc_login_20210513.xlsx') # workBook = xlrd.open_workbook(f'{BMCConfig.root_path}/test_case_data/bmc/bmc_login_20210513.xlsx')
@allure.story("登录") # @allure.story("登录")
@allure.severity("") # @allure.severity("")
@allure.title("{inData[testPoint]}") # @allure.title("{inData[testPoint]}")
@allure.testcase("{inData[yapiAddress]}") # @allure.testcase("{inData[yapiAddress]}")
@allure.description("url:/auth/login 。。。。") # @allure.description("url:/auth/login 。。。。")
@pytest.mark.parametrize("inData", get_excelData(workBook,'登录', 'login')) # @pytest.mark.parametrize("inData", get_excelData(workBook,'登录', 'login'))
def test_login(self,inData): # def test_login(self,inData):
url = f"{BMCConfig().host}{inData['url']}" # url = f"{BMCConfig().host}{inData['url']}"
method = inData['method'] # method = inData['method']
req_data = inData['reqData'] # req_data = inData['reqData']
expectData = inData['expectData'] # expectData = inData['expectData']
headers = config.BMCConfig.loginheader # headers = config.BMCConfig.loginheader
res = request_main(url= url,headers = headers,method =method,data = req_data,has_token=True) # res = request_main(url= url,headers = headers,method =method,data = req_data,has_token=True)
assert res['code'] == expectData['code'] # assert res['code'] == expectData['code']
#
@allure.story("激活") # @allure.story("激活")
@allure.link("") # @allure.link("")
@allure.description("/user/credit/idAuth") # @allure.description("/user/credit/idAuth")
@allure.title("{inData[testPoint]}") # @allure.title("{inData[testPoint]}")
@pytest.mark.parametrize("inData", get_excelData(workBook, '登录', 'Active')) # @pytest.mark.parametrize("inData", get_excelData(workBook, '登录', 'Active'))
def test_active(self,inData): # def test_active(self,inData):
url = f"{BMCConfig().host}{inData['url']}" # url = f"{BMCConfig().host}{inData['url']}"
method = inData['method'] # method = inData['method']
req_data = inData['reqData'] # req_data = inData['reqData']
expectData = inData['expectData'] # expectData = inData['expectData']
headers = config.BMCConfig.headers # headers = config.BMCConfig.headers
res = request_main(url=url, headers=headers, method=method, data=req_data) # res = request_main(url=url, headers=headers, method=method, data=req_data)
assert res['code'] == expectData['code'] # assert res['code'] == expectData['code']
class TestRegister(): class TestRegister():
...@@ -56,46 +56,46 @@ class TestRegister(): ...@@ -56,46 +56,46 @@ class TestRegister():
"""数据库操作""" """数据库操作"""
self.ms = MYSQL('10.197.236.190', 3306, 'root', '123456', 'edl_public') self.ms = MYSQL('10.197.236.190', 3306, 'root', '123456', 'edl_public')
@allure.story("获取用户登录类型") # @allure.story("获取用户登录类型")
@allure.link("http://yapi.hikcreate.com/project/31/interface/api/10745") # @allure.link("http://yapi.hikcreate.com/project/31/interface/api/10745")
@allure.description("/v1/user/login/type") # @allure.description("/v1/user/login/type")
@allure.title("{inData[testPoint]}") # @allure.title("{inData[testPoint]}")
@pytest.mark.flaky(reruns=2) # @pytest.mark.flaky(reruns=2)
@pytest.mark.parametrize("inData", get_excelData(workBook, '账号信息基本功能', 'logintypeRegister')) # @pytest.mark.parametrize("inData", get_excelData(workBook, '账号信息基本功能', 'logintypeRegister'))
def test_login_type_register(self, inData): # def test_login_type_register(self, inData):
url = f"{BMCConfig().host}{inData['url']}" # url = f"{BMCConfig().host}{inData['url']}"
method = inData['method'] # method = inData['method']
req_data = inData['reqData'] # req_data = inData['reqData']
expectData = inData['expectData'] # expectData = inData['expectData']
headers = inData['headers'] # headers = inData['headers']
phone = req_data['phone'] # phone = req_data['phone']
if not phone: # if not phone:
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False) # res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
assert res['code'] == expectData['code'] # assert res['code'] == expectData['code']
else: # else:
resList = self.ms.ExecuQuery(f'SELECT * FROM edl_public.user where phone={phone};') # resList = self.ms.ExecuQuery(f'SELECT * FROM edl_public.user where phone={phone};')
if resList: # 已经注册过 # if resList: # 已经注册过
user_id = self.resList[0]['id'] # user_id = self.resList[0]['id']
self.ms.ExecuNonQuery( # self.ms.ExecuNonQuery(
f'delete from edl_public.user where id={user_id};') # 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) # res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果") # allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code'] # assert res['code'] == expectData['code']
#
@allure.story("获取图形验证码") # @allure.story("获取图形验证码")
@allure.link("http://yapi.hikcreate.com/project/31/interface/api/20446") # @allure.link("http://yapi.hikcreate.com/project/31/interface/api/20446")
@allure.description("/sys/captcha") # @allure.description("/sys/captcha")
@allure.title("{inData[testPoint]}") # @allure.title("{inData[testPoint]}")
@pytest.mark.parametrize("inData", get_excelData(workBook, '账号信息基本功能', 'captchaRegister')) # @pytest.mark.parametrize("inData", get_excelData(workBook, '账号信息基本功能', 'captchaRegister'))
def test_captcha_register(self, inData): # def test_captcha_register(self, inData):
url = f"{BMCConfig().host}{inData['url']}" # url = f"{BMCConfig().host}{inData['url']}"
method = inData['method'] # method = inData['method']
req_data = inData['reqData'] # req_data = inData['reqData']
expectData = inData['expectData'] # expectData = inData['expectData']
headers = inData['headers'] # headers = inData['headers']
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False) # res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果") # allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code'] # assert res['code'] == expectData['code']
@pytest.fixture() @pytest.fixture()
def test_picture(self): def test_picture(self):
...@@ -131,14 +131,14 @@ class TestRegister(): ...@@ -131,14 +131,14 @@ class TestRegister():
req_data['horPercent'] = 1 req_data['horPercent'] = 1
elif casenum == 'verifyCodedetailRegister008': elif casenum == 'verifyCodedetailRegister008':
req_data['jtId'] = None req_data['jtId'] = None
elif casenum == 'verifyCodedetailRegister009' or casenum == 'verifyCodedetailRegister010': # elif casenum == 'verifyCodedetailRegister009' or casenum == 'verifyCodedetailRegister010':
time.sleep(60) # time.sleep(61)
# pass # pass
if not phone: if not phone:
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False) res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
print(res) print(res)
# 发送次数过多 # 发送次数过多
if res['msg'] == '验证码发送次数过多,请24小时后再试': if res['msg'] == '验证码发送次数过多,请24小时后再试' or res['msg'] == '发送的间隔时间必须大于1分钟!':
expectData['code'] = 1006 expectData['code'] = 1006
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
else: else:
...@@ -150,218 +150,218 @@ class TestRegister(): ...@@ -150,218 +150,218 @@ class TestRegister():
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False) res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
allure.attach("{0}".format(res), "用例结果") allure.attach("{0}".format(res), "用例结果")
# 发送次数过多 # 发送次数过多
if res['msg'] == '验证码发送次数过多,请24小时后再试': if res['msg'] == '验证码发送次数过多,请24小时后再试' or '发送的间隔时间' in res['msg'] :
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 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'] assert res['code'] == expectData['code']
@pytest.fixture() # @pytest.fixture()
def test_pre_gesture_login(self): # def test_pre_message(self):
"""请求令牌""" # """请求短信验证码"""
# 获取图片验证码 # # 获取图片验证码
picture_url = f"{BMCConfig().host}/sys/captcha" # url1 = f"{BMCConfig().host}/sys/captcha"
picture_method = 'get' # method1 = 'get'
picture_req_data = {"bCityCode": "520100", "bizType": "1"} # req_data1 = {"bCityCode":"520100","bizType":"1"}
picture_headers = None # headers = None
res_picture = request_main(url=picture_url, headers=picture_headers, method=picture_method, data=picture_req_data, has_token=False) # res_picture = request_main(url=url1, headers=headers, method=method1, data=req_data1, has_token=False)
# 获取短信验证码 #
pic_msg_url = f"{BMCConfig().host}/v1/user/login/verifyCode/detail" # # 获取短信验证码
pic_msg_method = 'post' # url = f"{BMCConfig().host}/v1/user/login/verifyCode/detail"
pic_msg_req_data = {"phone": "15999099999", "bizType": 1, "horPercent": None, "jtId": None, "bCityCode": "520100", # method = 'post'
"bNetTag": "trf_mgt"} # req_data = {"phone":"15999009999","bizType":1,"horPercent":None,"jtId":None,"bCityCode":"520100","bNetTag":"trf_mgt"}
pic_msg_headers = None # headers = None
phone = pic_msg_req_data['phone'] # phone = req_data['phone']
jtId = res_picture['data']['jtId'] #
pic_msg_req_data['jtId'] = jtId # jtId = res_picture['data']['jtId']
horPercent = int(RedisString(0).get(f'bmc:captcha:{jtId}')) # req_data['jtId'] = jtId
pic_msg_req_data['horPercent'] = horPercent # horPercent = int(RedisString(0).get(f'bmc:captcha:{jtId}'))
resList = self.ms.ExecuQuery(f'SELECT * FROM edl_public.user where phone={phone};') # req_data['horPercent'] = horPercent
if resList: # resList = self.ms.ExecuQuery(f'SELECT * FROM edl_public.user where phone={phone};')
user_id = resList[0]['id'] # if resList:
self.ms.ExecuNonQuery( # user_id = resList[0]['id']
f'delete from edl_public.user where id={user_id};') # self.ms.ExecuNonQuery(
request_main(url=pic_msg_url, headers=pic_msg_headers, method=pic_msg_method, data=pic_msg_req_data, has_token=False) # 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)
message_url = f"{BMCConfig().host}/user/login/verifyCode" #
message_method = 'post' # @allure.story("短信验证")
message_req_data = {"phone":"15999099999","bizType":1,"bCityCode":"520100","bNetTag":"trf_mgt","verifyCode":""} # @allure.link("http://yapi.hikcreate.com/project/31/interface/api/10787")
message_headers = None # @allure.description("/user/login/verifyCode")
try: # @allure.title("{inData[testPoint]}")
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.flaky(reruns=1)
@pytest.mark.parametrize("inData", get_excelData(workBook, '账号信息基本功能', 'gesturesetAndLoginRegister')) # @pytest.mark.parametrize("inData", get_excelData(workBook, '账号信息基本功能', 'loginverifyCodeRegister'))
def test_ges_ture_set_and_login_register(self, inData, test_pre_gesture_login): # def test_login_verify_code_register(self, inData, test_pre_message):
url = f"{BMCConfig().host}{inData['url']}" # url = f"{BMCConfig().host}{inData['url']}"
method = inData['method'] # method = inData['method']
req_data = inData['reqData'] # req_data = inData['reqData']
expectData = inData['expectData'] # expectData = inData['expectData']
headers = inData['headers'] # headers = inData['headers']
phone = req_data['phone'] # casenum = inData['caseNum']
casenum = inData['caseNum'] # phone = req_data['phone']
one_time_token = test_pre_gesture_login['data']['oneTimeToken'] # pre = test_pre_message
if not phone: # if not phone:
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False) # res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
assert res['code'] == expectData['code'] # assert res['code'] == expectData['code']
else: # else:
resList = self.ms.ExecuQuery(f'SELECT * FROM edl_public.user where phone={phone};') # resList = self.ms.ExecuQuery(f'SELECT * FROM edl_public.user where phone={phone};')
if resList: # if resList:
user_id = resList[0]['id'] # user_id = resList[0]['id']
self.ms.ExecuNonQuery( # self.ms.ExecuNonQuery(
f'delete from edl_public.user where id={user_id};') # f'delete from edl_public.user where id={user_id};')
if casenum >= 'gesturesetAndLoginRegister004': # if casenum == 'loginverifyCodeRegister004' or casenum == 'loginverifyCodeRegister005':
req_data['oneTimeToken'] = one_time_token # try:
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False) # verifyCode = int(RedisString(0).get(f'edl:sms_value:{phone}:MOBILE_REGISTER'))
allure.attach("{0}".format(res), "用例结果") # except Exception:
assert res['code'] == expectData['code'] # 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() # @pytest.fixture()
def test_pre_pwd_login(self): # def test_pre_gesture_login(self):
"""请求令牌""" # """请求令牌"""
# 获取图片验证码 # # 获取图片验证码
picture_url = f"{BMCConfig().host}/sys/captcha" # picture_url = f"{BMCConfig().host}/sys/captcha"
picture_method = 'get' # picture_method = 'get'
picture_req_data = {"bCityCode": "520100", "bizType": "1"} # picture_req_data = {"bCityCode": "520100", "bizType": "1"}
picture_headers = None # picture_headers = None
res_picture = request_main(url=picture_url, headers=picture_headers, method=picture_method, # res_picture = request_main(url=picture_url, headers=picture_headers, method=picture_method, data=picture_req_data, has_token=False)
data=picture_req_data, has_token=False) # # 获取短信验证码
# pic_msg_url = f"{BMCConfig().host}/v1/user/login/verifyCode/detail"
# 获取短信验证码 # pic_msg_method = 'post'
pic_msg_url = f"{BMCConfig().host}/v1/user/login/verifyCode/detail" # pic_msg_req_data = {"phone": "15999099999", "bizType": 1, "horPercent": None, "jtId": None, "bCityCode": "520100",
pic_msg_method = 'post' # "bNetTag": "trf_mgt"}
pic_msg_req_data = {"phone": "15999999999", "bizType": 1, "horPercent": None, "jtId": None, # pic_msg_headers = None
"bCityCode": "520100", # phone = pic_msg_req_data['phone']
"bNetTag": "trf_mgt"} # jtId = res_picture['data']['jtId']
pic_msg_headers = None # pic_msg_req_data['jtId'] = jtId
phone = pic_msg_req_data['phone'] # horPercent = int(RedisString(0).get(f'bmc:captcha:{jtId}'))
jtId = res_picture['data']['jtId'] # pic_msg_req_data['horPercent'] = horPercent
pic_msg_req_data['jtId'] = jtId # resList = self.ms.ExecuQuery(f'SELECT * FROM edl_public.user where phone={phone};')
horPercent = int(RedisString(0).get(f'bmc:captcha:{jtId}')) # if resList:
pic_msg_req_data['horPercent'] = horPercent # user_id = resList[0]['id']
resList = self.ms.ExecuQuery(f'SELECT * FROM edl_public.user where phone={phone};') # self.ms.ExecuNonQuery(
if resList: # f'delete from edl_public.user where id={user_id};')
user_id = resList[0]['id'] # request_main(url=pic_msg_url, headers=pic_msg_headers, method=pic_msg_method, data=pic_msg_req_data, has_token=False)
self.ms.ExecuNonQuery( # # 短信验证
f'delete from edl_public.user where id={user_id};') # message_url = f"{BMCConfig().host}/user/login/verifyCode"
request_main(url=pic_msg_url, headers=pic_msg_headers, method=pic_msg_method, data=pic_msg_req_data, # message_method = 'post'
has_token=False) # message_req_data = {"phone":"15999099999","bizType":1,"bCityCode":"520100","bNetTag":"trf_mgt","verifyCode":""}
# message_headers = None
# 短信验证 # try:
message_url = f"{BMCConfig().host}/user/login/verifyCode" # verifyCode = int(RedisString(0).get(f'edl:sms_value:{phone}:MOBILE_REGISTER'))
message_method = 'post' # except Exception as e:
message_req_data = {"phone": "15999999999", "bizType": 1, "bCityCode": "520100", "bNetTag": "trf_mgt", # raise TypeError('验证码发送次数过多,请24小时后再试')
"verifyCode": ""} # else:
message_headers = None # message_req_data['verifyCode'] = verifyCode
try: # res = request_main(url=message_url, headers=message_headers, method=message_method, data=message_req_data, has_token=False)
verifyCode = int(RedisString(0).get(f'edl:sms_value:{phone}:MOBILE_REGISTER')) # return res # {'success': True, 'code': 1000, 'msg': '操作成功', 'errorMsg': '操作成功', 'data': {'oneTimeToken': '357c8d80-e135-41a0-baae-009893f50a6e'}}
except Exception as e: #
raise TypeError('验证码发送次数过多,请24小时后再试') # @allure.story("设置手势-登录")
else: # @allure.link("http://yapi.hikcreate.com/project/31/interface/api/10974")
message_req_data['verifyCode'] = verifyCode # @allure.description("/v1/user/login/gesture/setAndLogin")
res = request_main(url=message_url, headers=message_headers, method=message_method, data=message_req_data, # @allure.title("{inData[testPoint]}")
has_token=False) # # @pytest.mark.flaky(reruns=1)
return res # {'success': True, 'code': 1000, 'msg': '操作成功', 'errorMsg': '操作成功', 'data': {'oneTimeToken': '357c8d80-e135-41a0-baae-009893f50a6e'}} # @pytest.mark.parametrize("inData", get_excelData(workBook, '账号信息基本功能', 'gesturesetAndLoginRegister'))
# def test_ges_ture_set_and_login_register(self, inData, test_pre_gesture_login):
@allure.story("字符密码-登录") # url = f"{BMCConfig().host}{inData['url']}"
@allure.link("http://yapi.hikcreate.com/project/31/interface/api/11027") # method = inData['method']
@allure.description("/v1/user/login/keyboardPwd/setAndLogin") # req_data = inData['reqData']
@allure.title("{inData[testPoint]}") # expectData = inData['expectData']
@pytest.mark.parametrize("inData", get_excelData(workBook, '账号信息基本功能', 'keyboardPwdsetAndLoginRegister')) # headers = inData['headers']
def test_keyboard_pwd_set_and_login_register(self, inData, test_pre_pwd_login): # phone = req_data['phone']
url = f"{BMCConfig().host}{inData['url']}" # casenum = inData['caseNum']
method = inData['method'] # one_time_token = test_pre_gesture_login['data']['oneTimeToken']
req_data = inData['reqData'] # if not phone:
expectData = inData['expectData'] # res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
headers = inData['headers'] # assert res['code'] == expectData['code']
phone = req_data['phone'] # else:
casenum = inData['caseNum'] # resList = self.ms.ExecuQuery(f'SELECT * FROM edl_public.user where phone={phone};')
one_time_token = test_pre_pwd_login['data']['oneTimeToken'] # if resList:
if not phone: # user_id = resList[0]['id']
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False) # self.ms.ExecuNonQuery(
assert res['code'] == expectData['code'] # f'delete from edl_public.user where id={user_id};')
else: # if casenum >= 'gesturesetAndLoginRegister004':
resList = self.ms.ExecuQuery(f'SELECT * FROM edl_public.user where phone={phone};') # req_data['oneTimeToken'] = one_time_token
if resList: # res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
user_id = resList[0]['id'] # allure.attach("{0}".format(res), "用例结果")
self.ms.ExecuNonQuery( # assert res['code'] == expectData['code']
f'delete from edl_public.user where id={user_id};') # #
if casenum >= 'keyboardPwdsetAndLoginRegister004': # @pytest.fixture()
req_data['oneTimeToken'] = one_time_token # def test_pre_pwd_login(self):
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'] # 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']
......
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