diff --git a/case_utils/data_handle.py b/case_utils/data_handle.py index f37abaf..a4d7d34 100644 --- a/case_utils/data_handle.py +++ b/case_utils/data_handle.py @@ -170,7 +170,6 @@ class DataHandle: # 获取FakerData类所有自定义方法 self.method_list = [method for method in dir(FakerData) if callable(getattr(FakerData, method)) and not method.startswith("__")] - self.should_print = True # 将"[1,2,3]" 或者"{'k':'v'}" -> [1,2,3], {'k':'v'} def eval_data(self, data): @@ -214,7 +213,7 @@ class DataHandle: func = {} keys = {} if not source or not isinstance(source, dict): - print("source为空或者source不是字典格式,都将认为是:{}") + # print("source为空或者source不是字典格式,都将认为是:{}") source = {} # 如果进来的是字符串,先将各种类型的表达式处理完 if isinstance(obj, str): @@ -283,6 +282,8 @@ class DataHandle: return obj + + # 声明data_handle方法,这样外部就可以直接import data_handle来使用了 data_handle = DataHandle().data_handle diff --git a/case_utils/request_data_handle.py b/case_utils/request_data_handle.py index 0e2f66b..814db6d 100644 --- a/case_utils/request_data_handle.py +++ b/case_utils/request_data_handle.py @@ -17,7 +17,7 @@ import allure # 本地应用/模块导入 from common_utils.files_handle import get_file_field from common_utils.base_request import BaseRequest -from case_utils.data_handle import eval_data_process, data_handle +from case_utils.data_handle import data_handle from case_utils.extract_data_handle import json_extractor, re_extract from case_utils.allure_handle import custom_allure_step from config.global_vars import GLOBAL_VARS @@ -59,7 +59,6 @@ class RequestPreDataHandle: self.cookies_handle() self.payload_handle() self.files_handle() - self.extract_handle() self.assert_handle() logger.debug(f"\n======================================================\n" \ "-------------End:处理用例数据后--------------------\n" @@ -201,17 +200,6 @@ class RequestPreDataHandle: logger.error(f"处理{files}报错了:{e}") raise TypeError(f"处理{files}报错了:{e}") - def extract_handle(self): - # 处理后置提取参数 - extract = self.request_data.get("extract", None) - try: - if extract: - # 仅提取参数中的python表达式,不需要进行数据替换 - self.request_data["extract"] = eval_data_process(extract) - except Exception as e: - logger.error(f"处理{extract}报错了:{e}") - raise TypeError(f"处理{extract}报错了:{e}") - def assert_handle(self): # 处理响应断言参数 assert_response = self.request_data.get("assert_response", None)