diff --git a/conftest.py b/conftest.py index 79379f7..825fdcb 100644 --- a/conftest.py +++ b/conftest.py @@ -101,7 +101,7 @@ if not db_config: @pytest.fixture(autouse=True) -def collection(): +def core(): class Core: def __init__(self): self.requests = RestClient() @@ -113,8 +113,3 @@ def collection(): yield Core() -@pytest.fixture() -def core(collection): - yield collection - - diff --git a/utils/data_process/params_replace_control.py b/utils/data_process/params_replace_control.py index 79b028e..d67c615 100644 --- a/utils/data_process/params_replace_control.py +++ b/utils/data_process/params_replace_control.py @@ -52,16 +52,16 @@ class DataHandler: if '{{' in value and '}}' in value and 'int.' not in value and 'str.' not in value: func = value[value.find('{') + 2:value.find('}')] - return value.replace('{{%s}}' % f'{func}', str(Mock(func)())) + return value.replace('{{%s}}' % func, str(Mock(func)())) elif '$cache.' in value: cache_name = value[value.find('.') + 1:] return self.cache_data.get(cache_name, None) elif 'int.' in value: func = value[value.find('{') + 2:value.find('}')] - return int(value.replace('{{%s}}' % f'{func}', str(Mock(func[func.find('.') + 1:])()))) + return int(value.replace('{{%s}}' % func, str(Mock(func[func.find('.') + 1:])()))) elif 'str.' in value: func = value[value.find('{') + 2:value.find('}')] - return str(value.replace('{{%s}}' % f'{func}', str(Mock(func[func.find('.') + 1:])()))) + return str(value.replace('{{%s}}' % func, str(Mock(func[func.find('.') + 1:])()))) else: return value diff --git a/utils/requests_process/requests_control.py b/utils/requests_process/requests_control.py index 1f1f215..a3b2e55 100644 --- a/utils/requests_process/requests_control.py +++ b/utils/requests_process/requests_control.py @@ -44,12 +44,6 @@ class RestClient: self.cookies, self.token = Authentication.cookie_token() self.client = httpx.Client(cookies=self.cookies, timeout=30, verify=False) - def __del__(self): - """ - 显式关闭会话 - """ - self.client.close() - def res_log(func): @wraps(func) def wrapper(*args, **kwargs):