Commit fa16076c by huangchengcheng

数据库连接读取配置参数

parent f095cf4a
......@@ -23,8 +23,7 @@ class TestMy:
config.BMCConfig.headers["Pvt-Token"]=getattr(config.BMCConfig,"bmc_pvt_token")
config.BMCConfig.headers["Token"]=getattr(config.BMCConfig,"bmc_token")
self.headers=config.BMCConfig.headers
mysql = MYSQL("10.197.236.190", 3306, "root", "123456", db="edl_public")
# mysql = MYSQL("10.197.236.215", 3306, "root", "DataCenter@!hik", db="edl_public")
mysql = MYSQL(*BaseConfig.test_mysql)
mysql.ExecuNonQuery( "insert into edl_public.feedback_type values ('10008611','自动化类型','0','1','0','2021-05-01 16:51:12','2021-05-01 16:51:12','520100,330100,500100');")
mysql.ExecuNonQuery( "INSERT INTO edl_public.trade (user_id,phone,brand_id,shop_id,trade_type,trade_amount,privilege_amount,pay_amount,uuid,trade_no,trade_source,memo,gmt_finished,status,gmt_create,gmt_modified,shop_name,brand_name,trade_status,remark_status,verification_status,settlement_status,refund_status,close_status,gmt_closed,close_memo,expired_status,gmt_expired,bill_status) VALUES (598137,'17822000000',48,112,2,2.55,0.00,2.55,'7ac6253d-8586-475d-8474-be848fe5c4b6','hik202105081390911897531973632',1,NULL ,NULL ,1,'2021-05-08 14:10:13.000','2021-05-24 17:25:30.000','回归测试门店1','回归(个人)1',3,'N/A','N/A','N/A','N/A','N/A',NULL,NULL,'N/A','2021-06-07 14:10:13.000','N/A');")
......@@ -149,9 +148,8 @@ class TestMy:
def test_myinfoaddressupdate(self,indata):
url=f'{config.BMCConfig.host}/{indata["url"]}'
method=indata["method"]
mysql = MYSQL("10.197.236.190", 3306, "root", "123456", db="edl_public")
# mysql = MYSQL("10.197.236.215", 3306, "root", "DataCenter@!hik", db="edl_public")
addressId=mysql.ExecuQuery("SELECT id FROM user_address WHERE address='接口自动化详细地址';")[-1]["id"]
mysql = MYSQL(*BaseConfig.test_mysql)
addressId=mysql.ExecuQuery("SELECT id FROM edl_public.user_address WHERE address='接口自动化详细地址';")[-1]["id"]
if indata["reqData"]["address"]=="存在":
indata["reqData"]["addressId"]=addressId
self.data=indata["reqData"]
......@@ -177,9 +175,8 @@ class TestMy:
def test_myinfoaddressdefault(self,indata):
url=f'{config.BMCConfig.host}/{indata["url"]}'
method=indata["method"]
mysql = MYSQL("10.197.236.190", 3306, "root", "123456", db="edl_public")
# mysql = MYSQL("10.197.236.215", 3306, "root", "DataCenter@!hik", db="edl_public")
addressId = mysql.ExecuQuery("SELECT id FROM user_address WHERE address='接口自动化详细地址';")[-1]["id"]
mysql = MYSQL(*BaseConfig.test_mysql)
addressId = mysql.ExecuQuery("SELECT id FROM edl_public.user_address WHERE address='接口自动化详细地址';")[-1]["id"]
if len(indata["reqData"]["addressId"])==0:
data = indata["reqData"]
else:
......@@ -207,9 +204,8 @@ class TestMy:
url = f'{config.BMCConfig.host}/{indata["url"]}'
method = indata["method"]
expectdata = indata["expectData"]
mysql = MYSQL("10.197.236.190", 3306, "root", "123456", db="edl_public")
# mysql = MYSQL("10.197.236.215", 3306, "root", "DataCenter@!hik", db="edl_public")
addressId = mysql.ExecuQuery("SELECT id FROM user_address WHERE address='接口自动化详细地址';")[-1]["id"]
mysql = MYSQL(*BaseConfig.test_mysql)
addressId = mysql.ExecuQuery("SELECT id FROM edl_public.user_address WHERE address='接口自动化详细地址';")[-1]["id"]
if len(indata["reqData"]["addressId"])==0:
data = indata["reqData"]
else:
......@@ -442,8 +438,7 @@ class TestMy:
indata["reqData"]["tradeId"]=1234567890
data = indata["reqData"]
else:
mysql = MYSQL("10.197.236.190", 3306, "root", "123456", db="edl_public")
# mysql = MYSQL("10.197.236.215", 3306, "root", "DataCenter@!hik", db="edl_public")
mysql = MYSQL(*BaseConfig.test_mysql)
tradeId = mysql.ExecuQuery("select id from edl_public.trade where status=1 and trade_status=2 limit 1;")[0]["id"]
indata["reqData"]["tradeId"]=tradeId
data=indata["reqData"]
......@@ -467,15 +462,13 @@ class TestMy:
indata["reqData"]["tradeId"] = 1234567890
data = indata["reqData"]
else:
mysql = MYSQL("10.197.236.190", 3306, "root", "123456", db="edl_public")
# mysql = MYSQL("10.197.236.215", 3306, "root", "DataCenter@!hik", db="edl_public")
mysql = MYSQL(*BaseConfig.test_mysql)
mysql.ExecuNonQuery("update edl_public.trade set trade_status='2'where user_id='598137';")
tradeId=mysql.ExecuQuery("select id from edl_public.trade where trade_status=2 and user_id='598137';")[-1]["id"]
indata["reqData"]["tradeId"] = tradeId
data = indata["reqData"]
else:
mysql = MYSQL("10.197.236.190", 3306, "root", "123456", db="edl_public")
# mysql = MYSQL("10.197.236.215", 3306, "root", "DataCenter@!hik", db="edl_public")
mysql = MYSQL(*BaseConfig.test_mysql)
mysql.ExecuNonQuery("update edl_public.trade set trade_status='1'where user_id='598137';")
tradeId = mysql.ExecuQuery("select id from edl_public.trade where status=1 and user_id='598137';")[-1]["id"]
indata["reqData"]["tradeId"] = tradeId
......@@ -532,8 +525,7 @@ class TestMy:
data = {"content":"自动化新用户意见数据","feedbackTypeId":feedbackTypeId}
method = "post"
res=request_main(url,self.headers,method,data)
mysql = MYSQL("10.197.236.190", 3306, "root", "123456", db="edl_public")
# mysql = MYSQL("10.197.236.215", 3306, "root", "DataCenter@!hik", db="edl_public")
mysql = MYSQL(*BaseConfig.test_mysql)
feedbackId=mysql.ExecuQuery("select feedback_id from edl_public.feedback_chat_record where user_id='598137' and content='自动化新用户意见数据';")[-1]["feedback_id"]
return feedbackId
......@@ -584,13 +576,11 @@ class TestMy:
expectdata = indata["expectData"]
otherexpectData=indata["otherExpectData"]
if indata['testPoint']=="有未读信息":
mysql = MYSQL("10.197.236.190", 3306, "root", "123456", db="edl_public")
# mysql = MYSQL("10.197.236.215", 3306, "root", "DataCenter@!hik", db="edl_public")
mysql = MYSQL(*BaseConfig.test_mysql)
mysql.ExecuNonQuery("update edl_public.feedback_main set read_flag='0'where user_id='598137'and feedback_type_id='10008611';")
mysql.ExecuNonQuery("update edl_public.feedback_main set status='1'where user_id='598137'and feedback_type_id='10008611';")
else:
mysql = MYSQL("10.197.236.190", 3306, "root", "123456", db="edl_public")
# mysql = MYSQL("10.197.236.215", 3306, "root", "DataCenter@!hik", db="edl_public")
mysql = MYSQL(*BaseConfig.test_mysql)
mysql.ExecuNonQuery( "update edl_public.feedback_main set read_flag='1'where user_id='598137'and feedback_type_id='10008611';")
self.res = request_main(url, self.headers, method, data)
try:
......@@ -616,25 +606,26 @@ class TestMy:
except Exception as e:
raise e
def teardown(self):
mysql = MYSQL("10.197.236.190", 3306, "root", "123456", db="edl_public")
# mysql = MYSQL("10.197.236.215", 3306, "root", "DataCenter@!hik", db="edl_public")
mysql = MYSQL(*BaseConfig.test_mysql)
mysql.ExecuNonQuery("delete from edl_public.feedback_type where id='10008611';")
mysql.ExecuNonQuery("delete from edl_public.feedback_chat_record where user_id='598137'")
mysql.ExecuNonQuery("delete from edl_public.feedback_main where user_id='598137'")
allure.attach(f"{self.res}",'响应结果',allure.attachment_type.TEXT)
def teardown_class(self):
mysql = MYSQL("10.197.236.190", 3306, "root", "123456", db="edl_public")
# mysql = MYSQL("10.197.236.215", 3306, "root", "DataCenter@!hik", db="edl_public")
mysql = MYSQL(*BaseConfig.test_mysql)
mysql.ExecuNonQuery("update edl_public.user set nickname='自动化' where id='598137';")
mysql.ExecuNonQuery( "delete from edl_public.user_address where user_id='598137'and address in ('接口自动化详细地址','存在');")
mysql.ExecuNonQuery("delete from edl_public.trade where user_id='598137'and trade_no='hik202105081390911897531973632';")
if __name__ == '__main__':
pytest.main(["-s","-v","test_my.py",'--alluredir', './bmc/report',"--clean-alluredir"])
# if __name__ == '__main__':
# pytest.main(["-s","-v","test_my.py",'--alluredir', './bmc/report',"--clean-alluredir"])
# pytest.main(['-v', '-s', "test_my.py::TestMy::test_basiccouponCode", '--alluredir', './bmc/report', "--clean-alluredir"])
os.system('allure serve ./bmc/report')
# os.system('allure serve ./bmc/report')
......@@ -26,9 +26,8 @@ class TestRoadreview:
config.BMCConfig.headers["bmc_token"]=res[0]
config.BMCConfig.headers["bmc_pvt_token"]=res[1]
self.headers=config.BMCConfig.headers
# mysql=MYSQL("10.197.236.190", 3306, "root", "123456", db="edl_private")
mysql = MYSQL("10.197.236.215", 3306, "root", "DataCenter@!hik", db="edl_public")
self.pvt_user_id=mysql.ExecuQuery("SELECT id FROM user WHERE phone='17822000000';")[0]["id"]
mysql=MYSQL(*BaseConfig.test_mysql)
self.pvt_user_id=mysql.ExecuQuery("SELECT id FROM edl_private.user WHERE phone='17822000000';")[0]["id"]
#不同账号登录,将sql中的user_id修改为获取到的用户专网id:self.pvt_user_id
......@@ -102,8 +101,7 @@ class TestRoadreview:
data={"isHasNotFinish": 0,"peoplePhone": "18800000044","companyName": "666","organizeCode": "168685858588855850","peopleName": "接口自动化","id":'null'}
method='post'
res=request_main(url,self.headers,method,data)
# mysql = MYSQL("10.197.236.190", 3306, "root", "123456", db="db_gy_dmsmp")
mysql = MYSQL("10.197.236.190", 3306, "root", "123456", db="db_gy_dmsmp")
mysql = MYSQL(*BaseConfig.test_mysql)
basic_info_id = mysql.ExecuQuery("select id from db_gy_dmsmp.occupy_road_apply where user_id=393038 and people_phone='18800000044'order by id;")[-1]["id"]
return basic_info_id
......@@ -149,19 +147,19 @@ class TestRoadreview:
# 处理关联任务的请求id
data =reqdata
res = request_main(url, self.headers, method, data)
return roadaddbasicinfo
@pytest.mark.usefixtures("roadaddoccupyroadinfo")
@allure.story("业务申请")
@allure.description("creator:林静文,autoCreator:huangchengcheng")
@allure.title("{indata[testPoint]}")
@pytest.mark.parametrize("indata", getExcelData.get_excelData(workbook, "非交通占用道路审查", "roadaddpFile"))
def test_roadaddfile(self, indata,roadaddbasicinfo):
def test_roadaddfile(self, indata,roadaddoccupyroadinfo):
url = f'{config.BMCConfig.host}/{indata["url"]}'
expectdata = indata["expectData"]
method = indata["method"]
indata["reqData"]["id"]=roadaddbasicinfo
indata["reqData"]["id"]=roadaddoccupyroadinfo
data = indata["reqData"]
self.res = request_main(url, self.headers, method, data)
try:
......@@ -239,8 +237,7 @@ class TestRoadreview:
def teardown_class(self):
mysql = MYSQL("10.197.236.190", 3306, "root", "123456", db="db_gy_dmsmp")
# mysql = MYSQL("10.197.236.190", 3306, "root", "123456", db="db_gy_dmsmp")
mysql = MYSQL(*BaseConfig.test_mysql)
mysql.ExecuNonQuery("delete from db_gy_dmsmp.occupy_road_apply where user_id='393038' and people_phone='18800000044' ;")
def teardown(self):
......@@ -251,10 +248,10 @@ class TestRoadreview:
if __name__ == '__main__':
# if __name__ == '__main__':
# 生成报告数据
pytest.main(['-v', '-s', "test_roadreview.py", '--alluredir', './bmc/report',"--clean-alluredir"])
# pytest.main(['-v', '-s', "test_roadreview.py::TestRoadreview::test_roaddetail", '--alluredir', './bmc/report', "--clean-alluredir"])
# pytest.main(['-v', '-s', "test_roadreview.py", '--alluredir', './bmc/report',"--clean-alluredir"])
# pytest.main(['-v', '-s', "test_roadreview.py::TestRoadreview::test_roadaddfile", '--alluredir', './bmc/report', "--clean-alluredir"])
# 打开报告
os.system('allure serve ./bmc/report')
\ No newline at end of file
# os.system('allure serve ./bmc/report')
\ No newline at end of file
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