config headers sso

common/tools.py

@@ -38,16 +38,18 @@ def get_headers():
         headers = BMCConfig.headers
         headers = BMCConfig.headers
     elif name == BmyConfig.name:
     elif name == BmyConfig.name:
         headers = BmyConfig.headers
         headers = BmyConfig.headers
-    # elif name == SsoConfig.name:
-    #     headers = SsoConfig.headers
+    elif name == SSOConfig.name:
+        headers = SSOConfig.headers
     return headers
     return headers
 
 
 
 
 def get_case_dir(product_name):
 def get_case_dir(product_name):
     """根据传入的产品名来运行对应产品的测试用例目录"""
     """根据传入的产品名来运行对应产品的测试用例目录"""
-    test_case_dir = BaseConfig.name
+    test_case_dir = BaseConfig.test_case_dir
     if product_name == BMCConfig.name:
     if product_name == BMCConfig.name:
         test_case_dir = BMCConfig.test_case_dir
         test_case_dir = BMCConfig.test_case_dir
     if product_name == BmyConfig.name:
     if product_name == BmyConfig.name:
         test_case_dir = BmyConfig.test_case_dir
         test_case_dir = BmyConfig.test_case_dir
+    if product_name == SSOConfig.name:
+        test_case_dir = SSOConfig.test_case_dir
     return test_case_dir
     return test_case_dir
\ No newline at end of file

config.py

@@ -67,6 +67,7 @@ class BmyConfig(BaseConfig):
 
 
 class SSOConfig(BaseConfig):
 class SSOConfig(BaseConfig):
     """SSO配置类"""
     """SSO配置类"""
+    name = "sso"
     sso_username = 'robot_fanxun'  # SSO登录名
     sso_username = 'robot_fanxun'  # SSO登录名
     sso_password = 'fx123456'  # 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登录地址

run.py

@@ -8,14 +8,14 @@ from common.tools import get_case_dir
 
 
 def get_parser():
 def get_parser():
     parser = argparse.ArgumentParser(description="argparse")
     parser = argparse.ArgumentParser(description="argparse")
-    parser.add_argument('--product', type=str, default=BaseConfig.name)
+    parser.add_argument('--product', type=str, default=BaseConfig.current_name)
     return parser
     return parser
 
 
 
 
 if __name__ == "__main__":
 if __name__ == "__main__":
     parser = get_parser()
     parser = get_parser()
     args = parser.parse_args()
     args = parser.parse_args()
-    BaseConfig.name = args.product
+    BaseConfig.current_name = args.product
     # 获取要执行的产品的用例目录
     # 获取要执行的产品的用例目录
     test_case_dir = get_case_dir(args.product)
     test_case_dir = get_case_dir(args.product)
     print("********此次执行的产品测试用例是：%s********"%test_case_dir)
     print("********此次执行的产品测试用例是：%s********"%test_case_dir)