modify request_main add token for headers

common/tools.py

@@ -29,9 +29,10 @@ def request_main(url, headers, method, data):
             # logging.log(str(e))
             # logging.log(str(e))
             raise Exception
             raise Exception
 
 
-    if headers == None or headers == {} or headers == "":
+    # if headers == None or headers == {} or headers == "":
         # 如果传的headers为空，使用各自产品的通用headers
         # 如果传的headers为空，使用各自产品的通用headers
-        headers = get_headers()
+    headers = build_headers(headers)
+    print(headers)
     try:
     try:
         res = request_by_method(method, headers)
         res = request_by_method(method, headers)
     except requests.exceptions.ConnectionError as e:
     except requests.exceptions.ConnectionError as e:
@@ -43,15 +44,22 @@ def request_main(url, headers, method, data):
     return res
     return res
 
 
 
 
-def get_headers():
+def build_headers(headers):
     name = BaseConfig.current_name
     name = BaseConfig.current_name
-    headers = BaseConfig.headers
+    # if headers == None or headers == {} or headers == "":
     if name == BMCConfig.name:
     if name == BMCConfig.name:
-        headers = BMCConfig.headers
+        if headers == None or headers == "":
+            headers = BMCConfig.headers
+        headers['Pvt-Token'] = BMCConfig.bmc_pvt_token
+        headers['Token'] = BMCConfig.bmc_token
     elif name == BmyConfig.name:
     elif name == BmyConfig.name:
-        headers = BmyConfig.headers
+        if headers == None or headers == "":
+            headers = BmyConfig.headers
+        headers['Authorization'] = BmyConfig.bmy_token
     elif name == SSOConfig.name:
     elif name == SSOConfig.name:
-        headers = SSOConfig.headers
+        if headers == None or headers == "":
+            headers = SSOConfig.headers
+        headers['Authorization'] = SSOConfig.sso_token
     return headers
     return headers
 
 
 
 

config.py

@@ -31,7 +31,7 @@ class BMCConfig(BaseConfig):
     bmc_pvt_token = ""  #专网token
     bmc_pvt_token = ""  #专网token
     host = "http://testbmcapp.hikcreate.com"  #bmc业务所有URL的host
     host = "http://testbmcapp.hikcreate.com"  #bmc业务所有URL的host
     #bmc除登录外所有的header
     #bmc除登录外所有的header
-    header = {
+    headers = {
         'City-Code': "520100",
         'City-Code': "520100",
         'Device-Brand': "vivo",
         'Device-Brand': "vivo",
         'Device-Code': "000000001e167ed7000000001e167ed7",
         'Device-Code': "000000001e167ed7000000001e167ed7",
@@ -66,7 +66,7 @@ class BmyConfig(BaseConfig):
     test_name_password = {"username": "15151500000", "password": "bmy123456"}
     test_name_password = {"username": "15151500000", "password": "bmy123456"}
     # 企业云接口的Authorization
     # 企业云接口的Authorization
     bmy_token = ''
     bmy_token = ''
-    header = {'Authorization':bmy_token,"Content-Type":"application/json"}
+    headers = {'Authorization':bmy_token,"Content-Type":"application/json"}
 
 
 
 
 class SSOConfig(BaseConfig):
 class SSOConfig(BaseConfig):

test_case/bmy/test_login.py

@@ -39,6 +39,7 @@ class TestLogin():
 
 
         """请求"""
         """请求"""
         res = request_main(url, headers, method, req_data)
         res = request_main(url, headers, method, req_data)
+        print(res)
 
 
         """断言"""
         """断言"""
         assert res['code'] == expectData['code']
         assert res['code'] == expectData['code']