Commit 0788fd52 by fanxun

Merge remote-tracking branch 'origin/master'

parents de66a797 a2002bed
...@@ -510,7 +510,7 @@ class TestViolationWarn(): ...@@ -510,7 +510,7 @@ class TestViolationWarn():
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/78646") @allure.link("http://yapi.hikcreate.com/project/31/interface/api/78646")
@allure.description("/vehicle/steward/petrol/consumption/list") @allure.description("/vehicle/steward/petrol/consumption/list")
...@@ -542,21 +542,21 @@ class TestViolationWarn(): ...@@ -542,21 +542,21 @@ class TestViolationWarn():
allure.attach("{0}".format(res), "用例结果") allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
# @pytest.mark.scoreDetail
# @allure.story("最后一个") @allure.story("删除油耗记录")
# @allure.link("http://yapi.hikcreate.com/project/31/interface/api/78640") @allure.link("http://yapi.hikcreate.com/project/31/interface/api/78642")
# @allure.description("/vehicle/steward/petrol/consumption/detail") @allure.description("/vehicle/steward/petrol/consumption/delete")
# @allure.title("{inData[testPoint]}") @allure.title("{inData[testPoint]}")
# @pytest.mark.parametrize("inData", get_excelData(workBook, '出行服务', 'consumptionDetail')) @pytest.mark.parametrize("inData", get_excelData(workBook, '出行服务', 'consumptionDelete'))
# def test_consumptionDetail(self, inData): def test_consumptionDelete(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']
# """请求""" """请求"""
# res = request_main(url, self.headers4, method, req_data, has_token=True) res = request_main(url, self.headers4, method, req_data, has_token=True)
# allure.attach("{0}".format(res), "用例结果") allure.attach("{0}".format(res), "用例结果")
# assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
if __name__ == '__main__': if __name__ == '__main__':
...@@ -564,4 +564,3 @@ if __name__ == '__main__': ...@@ -564,4 +564,3 @@ if __name__ == '__main__':
r'--alluredir=D:\项目\接口自动化\InterfaceAutoTest\report' , '--clean-alluredir']) r'--alluredir=D:\项目\接口自动化\InterfaceAutoTest\report' , '--clean-alluredir'])
os.system('allure serve D:\项目\接口自动化\InterfaceAutoTest\\report') os.system('allure serve D:\项目\接口自动化\InterfaceAutoTest\\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