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

test_case/bmc/conftest.py

@@ -6,14 +6,14 @@ import config
 from config import BMCConfig
 from config import BMCConfig
 from common.utils.encryption import Encryption
 from common.utils.encryption import Encryption
 import requests
 import requests
-# requests
-# @pytest.fixture(scope='module', autouse=True)
-# def bmc_login_fixture():
-#     """bmc登录获取token"""
-#
-#     indata = {"phone":"17822000000",
-#             "encodedGesture": "67e6d10010533eed4bbe9659863bf6ee"}
-#     res = BMC().bmc_login(indata)
-#     setattr(BMCConfig, 'bmc_token', res[0])
-#     setattr(BMCConfig, 'bmc_pvt_token', res[1])
+
+@pytest.fixture(scope='module', autouse=True)
+def bmc_login_fixture():
+    """bmc登录获取token"""
+
+    indata = {"phone":"17822000000",
+            "encodedGesture": "67e6d10010533eed4bbe9659863bf6ee"}
+    res = BMC().bmc_login(indata)
+    setattr(BMCConfig, 'bmc_token', res[0])
+    setattr(BMCConfig, 'bmc_pvt_token', res[1])
 
 

test_case/bmc/login/test_accountinfo.py → test_case/bmc/test_accountinfo.py

@@ -21,7 +21,7 @@ class TestLogin():
     @allure.title("{inData[testPoint]}")
     @allure.title("{inData[testPoint]}")
     @allure.testcase("{inData[yapiAddress]}")
     @allure.testcase("{inData[yapiAddress]}")
     @allure.description("url:/auth/login 。。。。")
     @allure.description("url:/auth/login 。。。。")
-    @pytest.mark.parametrize("inData", get_excelData(workBook,'账号信息基本功能', 'logipn'))
+    @pytest.mark.parametrize("inData", get_excelData(workBook,'账号信息基本功能', 'login'))
 
 
 
 
     def test_login(self,inData):
     def test_login(self,inData):