Commit 211ba578 by taoke

[交委项目]优化

parent 105d5357
...@@ -50,14 +50,14 @@ def riskPointdelete(): ...@@ -50,14 +50,14 @@ def riskPointdelete():
mysql = MYSQL(*BaseConfig.test_mysql) mysql = MYSQL(*BaseConfig.test_mysql)
mysql.ExecuNonQuery("delete from db_tbd_base1.risk_info where risk_name like '自动化新增%'") mysql.ExecuNonQuery("delete from db_tbd_base1.risk_info where risk_name like '自动化新增%'")
@allure.description("author:taoke")
@pytest.mark.usefixtures("riskPointdelete") @pytest.mark.usefixtures("riskPointdelete")
class TestRiskMan(): class TestRiskMan():
workBook = xlrd.open_workbook(f'{BaseConfig.root_path}/test_case_data/safe_transportation/jgd_riskCase.xlsx') workBook = xlrd.open_workbook(f'{BaseConfig.root_path}/test_case_data/safe_transportation/jgd_riskCase.xlsx')
@allure.story("风险规则配置") @allure.story("风险规则配置")
@allure.title("{inData[testPoint]}") @allure.title("{inData[testPoint]}")
@allure.testcase("http://yapi.hikcreate.com/project/336/interface/api/73931") @allure.testcase("http://yapi.hikcreate.com/project/336/interface/api/73931")
@allure.description("author:taoke")
@pytest.mark.parametrize("inData", get_excelData(workBook, "风险管理中心", "riskSave")) @pytest.mark.parametrize("inData", get_excelData(workBook, "风险管理中心", "riskSave"))
def test_riskPointsave(self, inData): def test_riskPointsave(self, inData):
url = f"{SafeTransportationConfig().SSO_url}{inData['url']}" url = f"{SafeTransportationConfig().SSO_url}{inData['url']}"
...@@ -79,7 +79,6 @@ class TestRiskMan(): ...@@ -79,7 +79,6 @@ class TestRiskMan():
@allure.story("风险规则配置") @allure.story("风险规则配置")
@allure.title("{inData[testPoint]}") @allure.title("{inData[testPoint]}")
@allure.testcase("http://yapi.hikcreate.com/project/336/interface/api/73931") @allure.testcase("http://yapi.hikcreate.com/project/336/interface/api/73931")
@allure.description("author:taoke")
@pytest.mark.parametrize("inData", get_excelData(workBook, "风险管理中心", "riskupdateSave")) @pytest.mark.parametrize("inData", get_excelData(workBook, "风险管理中心", "riskupdateSave"))
def test_riskupdateSave(self, inData,riskPointID): def test_riskupdateSave(self, inData,riskPointID):
url = f"{SafeTransportationConfig().SSO_url}{inData['url']}" url = f"{SafeTransportationConfig().SSO_url}{inData['url']}"
...@@ -96,7 +95,6 @@ class TestRiskMan(): ...@@ -96,7 +95,6 @@ class TestRiskMan():
@allure.story("风险规则配置") @allure.story("风险规则配置")
@allure.title("{inData[testPoint]}") @allure.title("{inData[testPoint]}")
@allure.testcase("http://yapi.hikcreate.com/project/336/interface/api/73931") @allure.testcase("http://yapi.hikcreate.com/project/336/interface/api/73931")
@allure.description("author:taoke")
@pytest.mark.parametrize("inData", get_excelData(workBook, "风险管理中心", "riskList")) @pytest.mark.parametrize("inData", get_excelData(workBook, "风险管理中心", "riskList"))
def test_riskList(self, inData): def test_riskList(self, inData):
url = f"{SafeTransportationConfig().SSO_url}{inData['url']}" url = f"{SafeTransportationConfig().SSO_url}{inData['url']}"
...@@ -113,6 +111,8 @@ class TestRiskMan(): ...@@ -113,6 +111,8 @@ class TestRiskMan():
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
if __name__ == '__main__': if __name__ == '__main__':
for one in os.listdir('../../../report/tmp'): for one in os.listdir('../../../report/tmp'):
if 'json' or 'txt' in one: if 'json' or 'txt' in one:
......
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