Merge branch 'master' of http://git.hikcreate.com/TestAuto/InterfaceAutoTest

config.py

@@ -46,9 +46,9 @@ class BMCConfig(BaseConfig):
         'Net': "wifi",
         'OS-Type': "Android",
         'OS-Version': "27",
-        'Pvt-Token': bmc_pvt_token,
+        'Pvt-Token': "",
         'Resolution': "2034x1080",
-        'Token': bmc_token,
+        'Token': "",
         'Version': "2.2.6"
     }
     #注册和注销专用账号

test_case/bmc/conftest.py

@@ -14,6 +14,12 @@ def bmc_login_fixture():
     indata = {"phone":"17822000000",
             "encodedGesture": "67e6d10010533eed4bbe9659863bf6ee"}
     res = BMC().bmc_login(indata)
-    setattr(BMCConfig, 'bmc_token', res[0])
-    setattr(BMCConfig, 'bmc_pvt_token', res[1])
+    # setattr(BMCConfig, 'bmc_token', res[0])
+    # setattr(BMCConfig, 'bmc_pvt_token', res[1])
+    BMCConfig.headers['Pvt-Token'] = res[1]
+    BMCConfig.headers['Token'] = res[0]
 
+if __name__ == '__main__':
+
+    bmc_login_fixture()
+    print("headers:================================", BMCConfig.headers)
\ No newline at end of file

test_case/bmc/test_accountinfo.py

@@ -34,3 +34,8 @@ class TestLogin():
         res = request_main(url= url,headers = headers,method =method,data = req_data,has_token=True)
         print(res)
         assert res['code'] == expectData['code']
+if __name__ == '__main__':
+    pytest.main(['-s', '-v', 'test_accountinfo.py',
+                 r'--alluredir=D:\项目\接口自动化\InterfaceAutoTest\report', '--clean-alluredir'])
+#
+    os.system('allure serve D:\项目\接口自动化\InterfaceAutoTest\\report')
\ No newline at end of file

test_case/bmc/test_credit_score.py

@@ -8,35 +8,31 @@ from common.tools import request_main
 from config import BMCConfig
 
 
-# @allure.feature("信用分")
-# class TestCreditScore():
-#     workBook = xlrd.open_workbook(f'{BMCConfig.root_path}/test_case_data/bmc/bmc_testcase01_20210513.xlsx')
-#
-#     # @allure.story("信用分")
-#     # @allure.title("{inData[testPoint]}")
-#     # @allure.testcase("{inData[yapiAddress]}")
-#     # @allure.description("url:/auth/login 。。。。")
-#     @pytest.mark.parametrize("inData", get_excelData(workBook, '信用分', 'creditscore001'))
-#     def test_creditscore(self,inData):
-#         url = f"{BMCConfig().host}{inData['url']}"
-#         method  = inData['method']
-#         req_data = inData['reqData']
-#         expectData = inData['expectData']
-#         headers = config.BMCConfig.loginheader
-#         #res = requests.post(url = url,headers =headers,json =req_data )
-#         res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=True)
-#         print(res)
-#         assert res['code'] == expectData['code']
+@allure.feature("信用分")
+class TestCreditScore():
+    workBook = xlrd.open_workbook(f'{BMCConfig.root_path}/test_case_data/bmc/bmc_testcase01_20210513.xlsx')
+
+    @allure.story("信用分")
+    @allure.title("{inData[testPoint]}")
+    @allure.testcase("{inData[yapiAddress]}")
+    @allure.description("url:/auth/login 。。。。")
+    @pytest.mark.parametrize("inData", get_excelData(workBook, '信用分', 'creditscore'))
+    def test_creditscore(self,inData):
+        url = f"{BMCConfig().host}{inData['url']}"
+        method  = inData['method']
+        req_data = inData['reqData']
+        expectData = inData['expectData']
+        headers = config.BMCConfig.headers
+        #res = requests.post(url = url,headers =headers,json =req_data )
+        res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=True)
+        print(config.BMCConfig.headers)
+        assert res['code'] == expectData['code']
 
 if __name__ == '__main__':
-#     pytest.main(['-s', '-v', 'test_credit_score.py',
-#                  r'--alluredir=D:\项目\接口自动化\InterfaceAutoTest\report', '--clean-alluredir'])
-# #
-    # os.system('allure serve D:\项目\接口自动化\InterfaceAutoTest\\report')
-#     print(TestCreditScore.workBook)
-    workBook = xlrd.open_workbook(f'{BMCConfig.root_path}/test_case_data/bmc/bmc_testcase01_20210513.xlsx')
-    initdata = get_excelData(workBook, '信用分', 'mycreditscore')
-    print(initdata)
+    pytest.main(['-s', '-v', 'test_credit_score.py',
+                 r'--alluredir=D:\项目\接口自动化\InterfaceAutoTest\report', '--clean-alluredir'])
+#
+    os.system('allure serve D:\项目\接口自动化\InterfaceAutoTest\\report')
 
 
 

test_case/bmc/test_integral.py

+__author__ = 'fanxun'
+__data__ = "2021-05-14 18:04"
+
+import pytest, allure, xlrd, os
+import config
+from common.utils.getExcelData import  get_excelData
+from common.tools import request_main
+from config import BMCConfig
+
+
+@allure.feature("积分商城")
+class TestCreditScore():
+    workBook = xlrd.open_workbook(f'{BMCConfig.root_path}/test_case_data/bmc/bmc_testcase01_20210513.xlsx')
+
+    @allure.story("积分商城")
+    @allure.title("{inData[testPoint]}")
+    @pytest.mark.parametrize("inData", get_excelData(workBook, '积分商城', 'Integral'))
+    def test_creditscore(self,inData):
+        url = f"{BMCConfig().host}{inData['url']}"
+        method  = inData['method']
+        req_data = inData['reqData']
+        expectData = inData['expectData']
+        headers = config.BMCConfig.headers
+        #res = requests.post(url = url,headers =headers,json =req_data )
+        res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=True)
+        print(res)
+        assert res['code'] == expectData['code']
+
+if __name__ == '__main__':
+    pytest.main(['-s', '-v', 'test_integral.py',
+                 r'--alluredir=D:\项目\接口自动化\InterfaceAutoTest\report', '--clean-alluredir'])
+#
+    os.system('allure serve D:\项目\接口自动化\InterfaceAutoTest\\report')
+
+
+
+
+