From 8b590467a0b6eb58d40a2754236f08e2295947f7 Mon Sep 17 00:00:00 2001 From: Evgeniy Zayats Date: Mon, 28 Apr 2025 17:26:57 -0400 Subject: [PATCH 1/2] neofs-testcases: update revision to current master Signed-off-by: Evgeniy Zayats --- neofs-testcases | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofs-testcases b/neofs-testcases index b61a602d2..2e3bbb855 160000 --- a/neofs-testcases +++ b/neofs-testcases @@ -1 +1 @@ -Subproject commit b61a602d2381ff30b1c4225b92eec5fa58e89f8d +Subproject commit 2e3bbb8559823e6eeb7fbcbfd07defda8953c88f From 06d8152b9988b01c39ee9ac7ddb863215be76473 Mon Sep 17 00:00:00 2001 From: Evgeniy Zayats Date: Mon, 28 Apr 2025 17:52:31 -0400 Subject: [PATCH 2/2] tests: actualize conftest and requirements.txt closes #88 Signed-off-by: Evgeniy Zayats --- conftest.py | 8 ++++---- requirements.txt | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/conftest.py b/conftest.py index 6e3ec79ca..ec7c20249 100644 --- a/conftest.py +++ b/conftest.py @@ -21,7 +21,7 @@ get_last_public_key_from_wallet, ) -from pytest_tests.tests.conftest import get_or_create_neofs_env, neofs_env_finalizer +from pytest_tests.tests.conftest import get_or_create_neofs_env from s3tests_boto3.functional import setup get_reporter().register_handler(AllureHandler()) @@ -150,8 +150,8 @@ def neofs_setup(request, temp_directory): config_template = Path("s3tests.conf.SAMPLE").read_text() jinja_template = jinja_env.from_string(config_template) rendered_config = jinja_template.render( - S3_HOST=neofs_env.s3_gw.address.split(":")[0], - S3_PORT=neofs_env.s3_gw.address.split(":")[1], + S3_HOST=neofs_env.s3_gw.endpoint.split(":")[0], + S3_PORT=neofs_env.s3_gw.endpoint.split(":")[1], S3_TLS=True, S3_MAIN_DISPLAY_NAME=main_wallet_address, S3_MAIN_USER_ID=main_wallet_public_key, @@ -175,7 +175,7 @@ def neofs_setup(request, temp_directory): yield neofs_env - neofs_env_finalizer(neofs_env, request) + neofs_env.finalize(request) @pytest.fixture(scope="session", autouse=True) diff --git a/requirements.txt b/requirements.txt index a3860810d..701acfb3c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -30,3 +30,6 @@ pytest-lazy-fixture==0.6.3 requests==2.32.0 tenacity==8.2.3 urllib3==2.2.1 +ruff==0.9.2 +pytest-xdist==3.6.1 +psutil==7.0.0