解决冲突

path_setting.py

@@ -636,7 +636,7 @@ ACHELOUS_REQUEST_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_om_api", "ach
 #直播-om后台-批量添加美购
 BATCH_ADD_SERVICE = os.path.join(BASE_DIR, "backend_auto/test_om_data/achelous_data", "batch_add_service.yaml")
 #登录
-ACCOUNT_DATA = os.path.join(BASE_DIR, "backend_auto/test_om_data/achelous_data", "account_login.yaml")
+ACCOUNT_DATAA = os.path.join(BASE_DIR, "backend_auto/test_om_data/achelous_data", "account_login.yaml")
 
 #次卡商详页
 BEAUTY_CARD_DETAIL = os.path.join(BASE_DIR, "backend_auto/test_backend_data/janus_data", "beauty_card_detail.yaml")

test_om_case/achelous_case/test_account_login.py

@@ -4,7 +4,7 @@ from all_om_api.achelous_request import achelous_request
 from ids_list import get_ids
 from in_common.base_request import BaseRequest
 class TestAccountLogin:
-    data = BaseRequest().api_load(path_setting.ACCOUNT_DATA)
+    data = BaseRequest().api_load(path_setting.ACCOUNT_DATAA)
     account_login_case, account_login_data = get_ids(data, "account_login")
 
     @pytest.mark.parametrize("param",account_login_data,ids=account_login_case)