Commit 21148bda by taoke

电子证照 和 my部分 读取配置中的 mysql配置

parent 4537b08f
...@@ -26,8 +26,8 @@ class BaseConfig(): ...@@ -26,8 +26,8 @@ class BaseConfig():
log_path = r'' # 日志路径 log_path = r'' # 日志路径
# 数据库 # 数据库
test_mysql = ("10.197.236.215", 3306, "root", "DataCenter@!hik", "") test_mysql_215 = ("10.197.236.215", 3306, "root", "DataCenter@!hik", "") # edl_private 、edl_public 、hik_trade 、 db_base_service
# test_mysql = ("10.197.236.190", 3306, "root", "123456", "") test_mysql = ("10.197.236.190", 3306, "root", "123456", "")
class BMCConfig(BaseConfig): class BMCConfig(BaseConfig):
......
...@@ -36,11 +36,11 @@ def get_vehickleId_Tounbind(): ...@@ -36,11 +36,11 @@ def get_vehickleId_Tounbind():
@pytest.fixture(scope='function') @pytest.fixture(scope='function')
def avatarUpdate_del() : #修改头像清除 def avatarUpdate_del() : #修改头像清除
# mysql=BaseConfig.test_mysql mysql=BaseConfig.test_mysql_215
# mysql = MYSQL(*mysql) mysql = MYSQL(*mysql)
# mysql = MYSQL(host="10.197.236.190", port=3306, user="root", pwd="123456", db="edl_private")
mysql = MYSQL("10.197.236.215", 3306, "root", "DataCenter@!hik", "edl_public")
# mysql = MYSQL(host="10.197.236.190", port=3306, user="root", pwd="123456", db="edl_private")
# mysql = MYSQL("10.197.236.215", 3306, "root", "DataCenter@!hik", "edl_public")
mysql.ExecuNonQuery( mysql.ExecuNonQuery(
"DELETE FROM edl_private.driving_license_image_audit WHERE name='自动化';") # 删除驾驶员 "DELETE FROM edl_private.driving_license_image_audit WHERE name='自动化';") # 删除驾驶员
RedisString(0).delete_key("bmc:c1:dl_img:uid") RedisString(0).delete_key("bmc:c1:dl_img:uid")
......
...@@ -55,11 +55,10 @@ class TestRegister(): ...@@ -55,11 +55,10 @@ class TestRegister():
# def test_mysql_result(self): # def test_mysql_result(self):
"""数据库操作""" """数据库操作"""
# self.ms = MYSQL('10.197.236.190', 3306, 'root', '123456', 'edl_public') # self.ms = MYSQL('10.197.236.190', 3306, 'root', '123456', 'edl_public')
self.ms = MYSQL("10.197.236.215", 3306, "root", "DataCenter@!hik", "edl_public") self.ms = MYSQL("10.197.236.215", 3306, "root", "DataCenter@!hik", "edl_public")
# mysql = BaseConfig.test_mysql # mysql = BaseConfig.test_mysql_215
# self.ms = MYSQL(*mysql) # self.ms = MYSQL(*mysql)
@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")
......
...@@ -24,7 +24,9 @@ class TestMy: ...@@ -24,7 +24,9 @@ class TestMy:
config.BMCConfig.headers["Token"]=getattr(config.BMCConfig,"bmc_token") config.BMCConfig.headers["Token"]=getattr(config.BMCConfig,"bmc_token")
self.headers=config.BMCConfig.headers self.headers=config.BMCConfig.headers
# mysql = MYSQL("10.197.236.190", 3306, "root", "123456", db="edl_public") # 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("10.197.236.215", 3306, "root", "DataCenter@!hik", db="edl_public")
mysql = BaseConfig.test_mysql_215
mysql = MYSQL(*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.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');") 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');")
...@@ -636,22 +638,22 @@ class TestMy: ...@@ -636,22 +638,22 @@ class TestMy:
def teardown(self): def teardown(self):
# mysql = MYSQL("10.197.236.190", 3306, "root", "123456", db="edl_public") # mysql = MYSQL("10.197.236.190", 3306, "root", "123456", db="edl_public")
# mysql = BaseConfig.test_mysql # mysql = MYSQL("10.197.236.215", 3306, "root", "DataCenter@!hik", db="edl_public")
# mysql = MYSQL(*mysql) mysql = BaseConfig.test_mysql_215
mysql = MYSQL("10.197.236.215", 3306, "root", "DataCenter@!hik", db="edl_public") mysql = MYSQL(*mysql)
mysql.ExecuNonQuery("delete from feedback_type where id='10008611';") mysql.ExecuNonQuery("delete from edl_public.feedback_type where id='10008611';")
mysql.ExecuNonQuery("delete from feedback_chat_record where user_id='598137'") mysql.ExecuNonQuery("delete from edl_public.feedback_chat_record where user_id='598137'")
mysql.ExecuNonQuery("delete from feedback_main 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) allure.attach(f"{self.res}",'响应结果',allure.attachment_type.TEXT)
def teardown_class(self): def teardown_class(self):
# mysql = MYSQL("10.197.236.190", 3306, "root", "123456", db="edl_public") # mysql = MYSQL("10.197.236.190", 3306, "root", "123456", db="edl_public")
# mysql = BaseConfig.test_mysql # mysql = MYSQL("10.197.236.215", 3306, "root", "DataCenter@!hik", db="edl_public")
# mysql = MYSQL(*mysql) mysql = BaseConfig.test_mysql_215
mysql = MYSQL("10.197.236.215", 3306, "root", "DataCenter@!hik", db="edl_public") mysql = MYSQL(*mysql)
mysql.ExecuNonQuery("update edl_public.user set nickname='自动化' where id='598137';") 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.user_address where user_id='598137'and address in ('接口自动化详细地址','存在');")
mysql.ExecuNonQuery("delete from trade where user_id='598137'and trade_no='hik202105081390911897531973632';") mysql.ExecuNonQuery("delete from edl_public.trade where user_id='598137'and trade_no='hik202105081390911897531973632';")
if __name__ == '__main__': if __name__ == '__main__':
pytest.main(["-s","-v","test_my.py",'--alluredir', './bmc/report',"--clean-alluredir"]) pytest.main(["-s","-v","test_my.py",'--alluredir', './bmc/report',"--clean-alluredir"])
......
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