fix confict

config.py

@@ -17,10 +17,12 @@ class BaseConfig():
     webhook = ''
     webhook = ''
 
 
     # SSO相关
     # SSO相关
-    username = 'fanxun'  # SSO登录名
-    password = 'fx123456'  # sso密码
+    sso_username = 'robot_fanxun'  # SSO登录名
+    sso_password = 'fx123456'  # sso密码
     sso_url = r'http://testtbdzj.hikcreate.com/web/auth/users/login'  # sso登录地址
     sso_url = r'http://testtbdzj.hikcreate.com/web/auth/users/login'  # sso登录地址
-    salt = 'hikcreate_xj'  # SSO盐值
+    sso_salt = 'hikcreate_xj'  # SSO盐值
+    sso_token = ''
+
 
 
 
 
 class BMCConfig(BaseConfig):
 class BMCConfig(BaseConfig):
@@ -36,9 +38,15 @@ class BmyConfig(BaseConfig):
     name = "bmy"
     name = "bmy"
     test_case_dir = "test_case/bmy/"
     test_case_dir = "test_case/bmy/"
     test_case_data_dir = "test_case_data/bmy/"
     test_case_data_dir = "test_case_data/bmy/"
-    key = "Jv+h&c0A"                                      # 获取token和密码加密原始密钥
-    defaultToken = "Basic aHpjcF93ZWI6MTIzNDU2"           # 获取token 原始token
-    # 测试环境
+    # 获取token和密码加密原始密钥
+    key = "Jv+h&c0A"
+    # 获取token 原始token
+    defaultToken = "Basic aHpjcF93ZWI6MTIzNDU2"
+    # 测试环境host
     test_host = "http://testyun.banmago.com/api"
     test_host = "http://testyun.banmago.com/api"
+    # 登录账号
+    test_name_password = {"username": "15151500000", "password": "bmy123456"}
+    # 企业云接口的Authorization
+    bmy_token = ''
 
 
 
 

service/login.py

@@ -112,12 +112,7 @@ class BMY():
 
 
 
 
 if __name__ == '__main__':
 if __name__ == '__main__':
-    # SSO登录测试
-    sso_token = SSOLogin().sso_login(url=BaseConfig.sso_url,
-                                     method='post',)
-    print(sso_token)
-
-
     # indata= {"username":"15150000000","password":"A123456"}
     # indata= {"username":"15150000000","password":"A123456"}
     # token= BMY().bmy_login(indata,getToken=False)
     # token= BMY().bmy_login(indata,getToken=False)
     # print(token)
     # print(token)
+    pass

test_case/bmy/conftest.py

+#作者: taoke
+#时间: 2021/5/8 11:43
+#编码: -- coding: utf-8 --
+#版本: !python3.7
+from service.login import BMY
+from config import BmyConfig
+import pytest
+
+@pytest.fixture(scope='module', autouse=True)
+def bmy_login():
+    """BMY登录获取token"""
+    res = BMY().bmy_login(BmyConfig.test_name_password)
+    setattr(BmyConfig,'bmy_token',res)
+

test_case/bmy/test_login.py

@@ -51,7 +51,6 @@ class TestLogin():
         """
         """
 
 
 
 
-
 if __name__ == '__main__':
 if __name__ == '__main__':
     for one in os.listdir('../../report/tmp'):  # 列出对应文件夹的数据
     for one in os.listdir('../../report/tmp'):  # 列出对应文件夹的数据
         if 'json' in one:
         if 'json' in one:

test_case/bmy/test_riskMonitar.py

+#作者: taoke
+#时间: 2021/5/8 10:39
+#编码: -- coding: utf-8 --
+#版本: !python3.7
+
+import pytest,allure,xlrd,requests,os
+from common.utils.getExcelData import  get_excelData
+from service.login import BMY
+from common.tools import request_main
+from config import BmyConfig
+from service.login import BMY
+@allure.epic("营运车企业端")
+@allure.feature("风控台")
+class TestLogin():
+    workBook = xlrd.open_workbook(f'{BmyConfig.root_path}/test_case_data/bmy/bmy_case.xlsx')
+    def setup_class(self):  # 每一个类下面所有的方法调用只运行一次
+        self.token = BMY().bmy_login(BmyConfig.test_name_password)
+
+    @allure.story("风险监控列表接口")
+    @allure.title("风险监控列表用例")
+    @allure.testcase("http://yapi.hikcreate.com/")
+    @allure.description("url:/auth/login 。。。。")
+    @pytest.mark.parametrize("inData", get_excelData(workBook,'风控台', 'riskMonitorList'))
+    def test_login(self,inData):
+        url = f"{BmyConfig().test_host}{inData['url']}"
+        method = inData['method']
+        req_data = inData['reqData']
+        expectData = inData['expectData']
+        headers = inData['headers']
+
+        """处理"""
+        headers['Authorization'] = self.token
+
+        """请求"""
+        res = request_main(url, headers, method, req_data)
+
+        """断言"""
+        assert res['code'] == expectData['code']
+
+
+if __name__ == '__main__':
+    for one in os.listdir('../../report/tmp'):  # 列出对应文件夹的数据
+        if 'json' in one:
+            os.remove(f'../../report/tmp/{one}')
+    pytest.main(['test_riskMonitar.py', '-s', '--alluredir', '../../report/tmp'])
+    # # 启动默认浏览器打开报告
+    os.system('allure serve ../../report/tmp')

test_case/bmy/test_riskMonitor2.py

+#作者: taoke
+#时间: 2021/5/8 10:39
+#编码: -- coding: utf-8 --
+#版本: !python3.7
+
+import pytest,allure,xlrd,requests,os
+from common.utils.getExcelData import  get_excelData
+from service.login import BMY
+from common.tools import request_main
+from config import BmyConfig
+from service.login import BMY
+@allure.epic("营运车企业端")
+@allure.feature("风控台")
+class TestLogin():
+    workBook = xlrd.open_workbook(f'{BmyConfig.root_path}/test_case_data/bmy/bmy_case.xlsx')
+
+    @allure.story("风险监控列表接口")
+    @allure.title("风险监控列表用例")
+    @allure.testcase("http://yapi.hikcreate.com/")
+    @allure.description("url:/auth/login 。。。。")
+    @pytest.mark.parametrize("inData", get_excelData(workBook,'风控台', 'riskMonitorList'))
+    def test_login(self,inData):
+        url = f"{BmyConfig().test_host}{inData['url']}"
+        method = inData['method']
+        req_data = inData['reqData']
+        expectData = inData['expectData']
+        headers = inData['headers']
+
+        """处理"""
+        headers['Authorization'] = BmyConfig.bmy_token
+
+        """请求"""
+        res = request_main(url, headers, method, req_data)
+
+        """断言"""
+        assert res['code'] == expectData['code']
+
+
+if __name__ == '__main__':
+    for one in os.listdir('../../report/tmp'):  # 列出对应文件夹的数据
+        if 'json' in one:
+            os.remove(f'../../report/tmp/{one}')
+    pytest.main(['test_riskMonitar.py', '-s', '--alluredir', '../../report/tmp'])
+    # # 启动默认浏览器打开报告
+    os.system('allure serve ../../report/tmp')

test_case/sso/__init__.py

+__author__ = 'fanxun'
+__data__ = "2021-05-08 11:08"
\ No newline at end of file

test_case/sso/conftest.py

+__author__ = 'fanxun'
+__data__ = "2021-05-08 10:26"
+import pytest
+from config import BaseConfig
+from common.utils.encryption import Encryption
+from common.tools import request_main
+
+@pytest.fixture(scope='module', autouse=True)
+def sso_login():
+    """SSO登录获取token"""
+    encrypted_password = Encryption().get_md5(BaseConfig.sso_password, salt=BaseConfig.sso_salt)
+    req_data = {"loginName": BaseConfig.sso_username, "password": encrypted_password}
+    res = request_main(BaseConfig.sso_url, headers=None, method='post', data=req_data)
+    setattr(BaseConfig, 'sso_token', res['data']['token'])
+
+
+
+
+