Merge branch 'a_branch'

common/utils/getExcelData.py

@@ -14,6 +14,7 @@ def get_excelData(workBook,sheetName,caseName):
         num_method = list_title.index('method')
         num_method = list_title.index('method')
         num_reqData = list_title.index('reqData')
         num_reqData = list_title.index('reqData')
         num_expectData = list_title.index('expectData')
         num_expectData = list_title.index('expectData')
+        num_testPoint = list_title.index('testPoint')
         lis = []
         lis = []
 
 
         idx = 0
         idx = 0
@@ -27,6 +28,7 @@ def get_excelData(workBook,sheetName,caseName):
                     dict0['method'] = workSheet.cell_value(idx, num_method)
                     dict0['method'] = workSheet.cell_value(idx, num_method)
                     dict0['reqData'] = workSheet.cell_value(idx, num_reqData)
                     dict0['reqData'] = workSheet.cell_value(idx, num_reqData)
                     dict0['expectData'] = workSheet.cell_value(idx, num_expectData)
                     dict0['expectData'] = workSheet.cell_value(idx, num_expectData)
+                    testPoint= workSheet.cell_value(idx, num_testPoint)
 
 
                     # json字符串转换成字典
                     # json字符串转换成字典
                     dict0['reqData'] = json.loads(dict0['reqData'])
                     dict0['reqData'] = json.loads(dict0['reqData'])
@@ -35,8 +37,8 @@ def get_excelData(workBook,sheetName,caseName):
                         dict0['headers'] = json.loads(dict0['headers'])
                         dict0['headers'] = json.loads(dict0['headers'])
                     except:
                     except:
                         # print('header无')
                         # print('header无')
-                        dict0['headers']=None
-                    lis.append(dict0)
+                        dict0['headers'] = None
+                    lis.append((dict0,testPoint))
                 idx += 1
                 idx += 1
             return lis
             return lis
         except:
         except:

config.py

@@ -6,7 +6,7 @@ class BaseConfig():
     # 请求头
     # 请求头
     headers = {'Content-Type': 'application/json'}
     headers = {'Content-Type': 'application/json'}
     # 当前运行的产品名 #auto
     # 当前运行的产品名 #auto
-    current_name = "auto"
+    current_name = "bmy"
     test_case_dir = "test_case/"
     test_case_dir = "test_case/"
 
 
     secs=0.1                    # 测试用例间隔运行时间
     secs=0.1                    # 测试用例间隔运行时间

test_case/bmy/test_riskMonitar.py

@@ -11,21 +11,22 @@ from config import BmyConfig
 from service.login import BMY
 from service.login import BMY
 @allure.epic("营运车企业端")
 @allure.epic("营运车企业端")
 @allure.feature("风控台")
 @allure.feature("风控台")
-class TestLogin():
+class TestMonitor():
     workBook = xlrd.open_workbook(f'{BmyConfig.root_path}/test_case_data/bmy/bmy_case.xlsx')
     workBook = xlrd.open_workbook(f'{BmyConfig.root_path}/test_case_data/bmy/bmy_case.xlsx')
     # def setup_class(self):  # 每一个类下面所有的方法调用只运行一次
     # def setup_class(self):  # 每一个类下面所有的方法调用只运行一次
     #     self.token = BMY().bmy_login(BmyConfig.test_name_password)
     #     self.token = BMY().bmy_login(BmyConfig.test_name_password)
-    @allure.story("风险监控列表接口")
-    @allure.title("风险监控列表用例")
+    @allure.story("风险列表")
+    @allure.title("{testPoint}")
     @allure.testcase("http://yapi.hikcreate.com/")
     @allure.testcase("http://yapi.hikcreate.com/")
     @allure.description("url:/auth/login 。。。。")
     @allure.description("url:/auth/login 。。。。")
-    @pytest.mark.parametrize("inData", get_excelData(workBook,'风控台', 'riskMonitorList'))
-    def test_login(self,inData):
+    @pytest.mark.parametrize("inData,testPoint", get_excelData(workBook,'风控台', 'riskMonitorList'))
+    def test_login(self,inData,testPoint):
         url = f"{BmyConfig().test_host}{inData['url']}"
         url = f"{BmyConfig().test_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']
+        # print(inData['testPoint'])
 
 
         """请求"""
         """请求"""
         res = request_main(url, headers, method, req_data)
         res = request_main(url, headers, method, req_data)