Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down Expand Up @@ -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,
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion neofs-testcases
Submodule neofs-testcases updated 96 files
+19 −6 .github/workflows/system-tests.yml
+0 −1 .gitignore
+17 −0 README.md
+6 −2 neofs-testlib/neofs_testlib/cli/cli_command.py
+16 −0 neofs-testlib/neofs_testlib/cli/neofs_adm/fschain.py
+2 −0 neofs-testlib/neofs_testlib/cli/neofs_cli/accounting.py
+7 −1 neofs-testlib/neofs_testlib/cli/neofs_cli/acl.py
+2 −0 neofs-testlib/neofs_testlib/cli/neofs_cli/bearer.py
+16 −0 neofs-testlib/neofs_testlib/cli/neofs_cli/container.py
+20 −4 neofs-testlib/neofs_testlib/cli/neofs_cli/control.py
+8 −0 neofs-testlib/neofs_testlib/cli/neofs_cli/netmap.py
+18 −0 neofs-testlib/neofs_testlib/cli/neofs_cli/object.py
+2 −0 neofs-testlib/neofs_testlib/cli/neofs_cli/session.py
+12 −0 neofs-testlib/neofs_testlib/cli/neofs_cli/shards.py
+8 −0 neofs-testlib/neofs_testlib/cli/neofs_cli/storagegroup.py
+4 −0 neofs-testlib/neofs_testlib/cli/neofs_cli/util.py
+323 −196 neofs-testlib/neofs_testlib/env/env.py
+3 −4 neofs-testlib/neofs_testlib/env/templates/ir.yaml
+2 −2 neofs-testlib/neofs_testlib/env/templates/neofs_env_config.yaml
+8 −0 neofs-testlib/neofs_testlib/env/templates/network.yaml
+1 −0 neofs-testlib/neofs_testlib/env/templates/rest.yaml
+0 −3 neofs-testlib/neofs_testlib/env/templates/s3.yaml
+3 −18 neofs-testlib/neofs_testlib/env/templates/sn.yaml
+67 −0 neofs-testlib/neofs_testlib/env/templates/sn_post_0_45_2.yaml
+5 −5 neofs-testlib/neofs_testlib_tests/pytest/test_env.py
+40 −10 neofs-testlib/neofs_testlib_tests/unit/test_cli.py
+6 −2 pytest_tests/lib/helpers/cli_helpers.py
+2 −0 pytest_tests/lib/helpers/common.py
+1 −2 pytest_tests/lib/helpers/complex_object_actions.py
+1 −0 pytest_tests/lib/helpers/grpc_responses.py
+2 −1 pytest_tests/lib/helpers/json_transformers.py
+2 −3 pytest_tests/lib/helpers/neofs_verbs.py
+1 −1 pytest_tests/lib/helpers/node_management.py
+80 −1 pytest_tests/lib/helpers/rest_gate.py
+1 −0 pytest_tests/lib/helpers/session_token.py
+8 −10 pytest_tests/lib/neofs_env/neofs_env_test_base.py
+1 −1 pytest_tests/lib/neofs_env/neofs_epoch.py
+11 −0 pytest_tests/lib/rest_gw/rest_base.py
+40 −4 pytest_tests/lib/rest_gw/rest_utils.py
+23 −10 pytest_tests/lib/s3/s3_base.py
+0 −9 pytest_tests/lib/s3/s3_bucket.py
+0 −4 pytest_tests/lib/s3/s3_object.py
+2 −2 pytest_tests/tests/acl/test_acl.py
+2 −2 pytest_tests/tests/acl/test_bearer.py
+2 −2 pytest_tests/tests/acl/test_eacl.py
+29 −27 pytest_tests/tests/acl/test_eacl_filters.py
+33 −40 pytest_tests/tests/acl/test_storagegroup.py
+48 −87 pytest_tests/tests/conftest.py
+25 −11 pytest_tests/tests/container/test_container.py
+7 −7 pytest_tests/tests/contract/test_contract.py
+4 −4 pytest_tests/tests/failovers/test_failover_network.py
+105 −8 pytest_tests/tests/failovers/test_failover_storage.py
+2 −2 pytest_tests/tests/load/test_load.py
+2 −2 pytest_tests/tests/metrics/test_metrics.py
+104 −8 pytest_tests/tests/metrics/test_sn_metrics.py
+3 −3 pytest_tests/tests/network/test_config_changes.py
+5 −7 pytest_tests/tests/network/test_deployment.py
+13 −11 pytest_tests/tests/network/test_homomorphic_hash.py
+1 −1 pytest_tests/tests/network/test_ir_change.py
+9 −9 pytest_tests/tests/network/test_ir_controls.py
+16 −16 pytest_tests/tests/network/test_node_management.py
+47 −46 pytest_tests/tests/object/test_object_api.py
+28 −27 pytest_tests/tests/object/test_object_api_bearer.py
+6 −7 pytest_tests/tests/object/test_object_lifetime.py
+38 −27 pytest_tests/tests/object/test_object_lock.py
+418 −60 pytest_tests/tests/object/test_object_searchv2.py
+2 −2 pytest_tests/tests/payment/test_balance.py
+26 −29 pytest_tests/tests/payment/test_container_payments.py
+6 −6 pytest_tests/tests/s3/s3_extensions/test_s3_gate_policy.py
+42 −21 pytest_tests/tests/s3/test_s3.py
+4 −4 pytest_tests/tests/s3/test_s3_ACL.py
+5 −5 pytest_tests/tests/s3/test_s3_bucket.py
+131 −124 pytest_tests/tests/s3/test_s3_locking.py
+1 −1 pytest_tests/tests/s3/test_s3_nexus.py
+124 −64 pytest_tests/tests/s3/test_s3_object.py
+2 −2 pytest_tests/tests/s3/test_s3_presigned.py
+8 −3 pytest_tests/tests/s3/test_s3_tagging.py
+8 −3 pytest_tests/tests/s3/test_s3_versioning.py
+1 −1 pytest_tests/tests/s3/test_s3_warp.py
+2 −2 pytest_tests/tests/services/rest_gate/conftest.py
+6 −9 pytest_tests/tests/services/rest_gate/test_rest_bearer.py
+17 −43 pytest_tests/tests/services/rest_gate/test_rest_containers.py
+184 −28 pytest_tests/tests/services/rest_gate/test_rest_gate.py
+35 −29 pytest_tests/tests/services/rest_gate/test_rest_gate_new.py
+8 −9 pytest_tests/tests/services/rest_gate/test_rest_headers.py
+5 −6 pytest_tests/tests/services/rest_gate/test_rest_object.py
+5 −6 pytest_tests/tests/services/rest_gate/test_rest_object_new.py
+4 −4 pytest_tests/tests/services/rest_gate/test_rest_options.py
+4 −5 pytest_tests/tests/services/rest_gate/test_rest_streaming.py
+18 −19 pytest_tests/tests/services/rest_gate/test_rest_system_header.py
+7 −8 pytest_tests/tests/session_token/test_object_session_token.py
+22 −17 pytest_tests/tests/session_token/test_static_object_session_token.py
+14 −11 pytest_tests/tests/session_token/test_static_session_token_container.py
+13 −3 pytest_tests/tests/shard/test_control_shard.py
+5 −1 pytest_tests/tests/system/test_sighup.py
+2 −2 requirements.txt
3 changes: 3 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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