Merge remote-tracking branch 'origin/master'

# Conflicts:
#	test_case_data/bmc/bmc_testcase01_20210513.xlsx

service/login.py

@@ -20,7 +20,7 @@ class SSOLogin():
     def sso_login(self,url, method='post', headers=None):
     def sso_login(self,url, method='post', headers=None):
         """SSO登录获取token"""
         """SSO登录获取token"""
         encrypted_password = self._sso_pwd_encrypted(SSOConfig.sso_password)
         encrypted_password = self._sso_pwd_encrypted(SSOConfig.sso_password)
-        req_data = {f"loginName":SSOConfig.sso_username,"password":encrypted_password}
+        req_data = {"loginName":SSOConfig.sso_username,"password":encrypted_password}
         res = request_main(url, headers, method, req_data)
         res = request_main(url, headers, method, req_data)
         return res['data']['token']
         return res['data']['token']
 
 

test_case/bmc/test_credit_score.py

+__author__ = 'fanxun'
+__data__ = "2021-05-14 14:13"
+
+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]}")
+#     # @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']
+
+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)
+
+
+