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

config.py

@@ -26,6 +26,8 @@ class BMCConfig(BaseConfig):
     name = "bmc"
     name = "bmc"
     test_case_dir = "test_case/bmc/"
     test_case_dir = "test_case/bmc/"
     test_case_data_dir = "test_case_data/bmc/"
     test_case_data_dir = "test_case_data/bmc/"
+    bmcphone = "17822000000"
+    encodedGesture = "67e6d10010533eed4bbe9659863bf6ee"
     bmc_login_url = "http://testbmcapp.hikcreate.com/v1/user/login/gesture"
     bmc_login_url = "http://testbmcapp.hikcreate.com/v1/user/login/gesture"
     bmc_token = ""  #公网加密token
     bmc_token = ""  #公网加密token
     bmc_pvt_token = ""  #专网token
     bmc_pvt_token = ""  #专网token

service/login.py

@@ -109,7 +109,7 @@ class BMC():
         print(resp.json())
         print(resp.json())
         pvt_token = resp.json()["data"]["token"]
         pvt_token = resp.json()["data"]["token"]
         print(pvt_token)
         print(pvt_token)
-        return encrypted_token,pvt_token
+        return encrypted_token, pvt_token
 
 
 
 
 if __name__ == '__main__':
 if __name__ == '__main__':

test_case/bmy/test1.py

-#作者: taoke
-#时间: 2021/5/10 17:44
-#编码: -- coding: utf-8 --
-#版本: !python3.7
-
-# 测试Jenkins拉取代码
\ No newline at end of file

test_case/bmy/test_login.py

@@ -61,4 +61,3 @@ if __name__ == '__main__':
     pytest.main(['test_login.py', '-s', '--alluredir', '../../report/tmp'])
     pytest.main(['test_login.py', '-s', '--alluredir', '../../report/tmp'])
     # # 启动默认浏览器打开报告
     # # 启动默认浏览器打开报告
     os.system('allure serve ../../report/tmp')
     os.system('allure serve ../../report/tmp')
-    # requests.post("http://testyun.banmago.com/api/auth/login",data=)
\ No newline at end of file