From a9e0ddfe6623539ed172389b82e977be68e2366c Mon Sep 17 00:00:00 2001 From: "a.berezin" Date: Fri, 11 Oct 2024 12:30:23 +0300 Subject: [PATCH 1/3] [#309] Add marks Signed-off-by: a.berezin --- .../testsuites/access/acl/test_acl.py | 2 +- .../testsuites/access/ape/test_ape.py | 1 + .../testsuites/access/ape/test_ape_filters.py | 1 + .../testsuites/access/ape/test_bearer.py | 1 + .../testsuites/container/test_container.py | 3 +- .../testsuites/container/test_policy.py | 272 +++++------------- .../metrics/test_container_metrics.py | 1 + .../metrics/test_garbage_collector_metrics.py | 1 + .../testsuites/metrics/test_grpc_metrics.py | 37 +-- .../testsuites/metrics/test_logs_metrics.py | 1 + .../testsuites/metrics/test_object_metrics.py | 1 + .../testsuites/metrics/test_shard_metrics.py | 15 +- .../testsuites/object/test_object_api.py | 48 +--- .../object/test_object_api_bearer.py | 2 +- .../testsuites/object/test_object_lifetime.py | 1 + .../testsuites/object/test_object_lock.py | 1 + .../object/test_object_without_user.py | 1 + .../replication/test_ec_replication.py | 1 + .../services/http_gate/test_http_gate.py | 13 +- .../services/http_gate/test_http_object.py | 1 + .../services/s3_gate/test_s3_ACL.py | 1 + .../services/s3_gate/test_s3_bucket.py | 1 + .../services/s3_gate/test_s3_locking.py | 22 +- .../services/s3_gate/test_s3_multipart.py | 1 + .../services/s3_gate/test_s3_object.py | 51 +--- .../services/s3_gate/test_s3_policy.py | 5 +- .../services/s3_gate/test_s3_tagging.py | 1 + .../services/s3_gate/test_s3_versioning.py | 9 +- .../test_object_session_token.py | 2 +- .../test_static_object_session_token.py | 8 +- .../test_static_session_token_container.py | 1 + .../testsuites/shard/test_control_shard.py | 1 + 32 files changed, 154 insertions(+), 353 deletions(-) diff --git a/pytest_tests/testsuites/access/acl/test_acl.py b/pytest_tests/testsuites/access/acl/test_acl.py index f83ad114..a8d9ebb5 100644 --- a/pytest_tests/testsuites/access/acl/test_acl.py +++ b/pytest_tests/testsuites/access/acl/test_acl.py @@ -13,8 +13,8 @@ from pytest_tests.helpers.container_access import assert_full_access_to_containe from ....helpers.container_spec import ContainerSpec +@pytest.mark.nightly @pytest.mark.sanity -@pytest.mark.smoke @pytest.mark.acl class TestACLBasic(ClusterTestBase): @allure.title("Operations in public container available to everyone (obj_size={object_size})") diff --git a/pytest_tests/testsuites/access/ape/test_ape.py b/pytest_tests/testsuites/access/ape/test_ape.py index 3581099d..56874075 100644 --- a/pytest_tests/testsuites/access/ape/test_ape.py +++ b/pytest_tests/testsuites/access/ape/test_ape.py @@ -32,6 +32,7 @@ def allowed_wallet(default_wallet: WalletInfo, other_wallet: WalletInfo, role: a return default_wallet if role == ape.Role.OTHERS else other_wallet +@pytest.mark.nightly @pytest.mark.ape class TestApeContainer(ClusterTestBase): @pytest.mark.sanity diff --git a/pytest_tests/testsuites/access/ape/test_ape_filters.py b/pytest_tests/testsuites/access/ape/test_ape_filters.py index faedcf44..b292a858 100644 --- a/pytest_tests/testsuites/access/ape/test_ape_filters.py +++ b/pytest_tests/testsuites/access/ape/test_ape_filters.py @@ -23,6 +23,7 @@ from pytest_tests.helpers.object_access import OBJECT_NO_ACCESS from ....helpers.container_spec import ContainerSpec +@pytest.mark.nightly @pytest.mark.ape class TestApeFilters(ClusterTestBase): # SPEC: https://github.com/nspcc-dev/neofs-spec/blob/master/01-arch/07-acl.md diff --git a/pytest_tests/testsuites/access/ape/test_bearer.py b/pytest_tests/testsuites/access/ape/test_bearer.py index f8bd9132..66045ebb 100644 --- a/pytest_tests/testsuites/access/ape/test_bearer.py +++ b/pytest_tests/testsuites/access/ape/test_bearer.py @@ -16,6 +16,7 @@ from pytest_tests.helpers.container_access import ( ) +@pytest.mark.nightly @pytest.mark.sanity @pytest.mark.bearer @pytest.mark.ape diff --git a/pytest_tests/testsuites/container/test_container.py b/pytest_tests/testsuites/container/test_container.py index 1b641bb2..d34a109e 100644 --- a/pytest_tests/testsuites/container/test_container.py +++ b/pytest_tests/testsuites/container/test_container.py @@ -16,8 +16,9 @@ from frostfs_testlib.testing.cluster_test_base import ClusterTestBase from pytest_tests.helpers.utility import placement_policy_from_container -@pytest.mark.container +@pytest.mark.nightly @pytest.mark.sanity +@pytest.mark.container class TestContainer(ClusterTestBase): @allure.title("Create container (name={name})") @pytest.mark.parametrize("name", ["", "test-container"], ids=["No name", "Set particular name"]) diff --git a/pytest_tests/testsuites/container/test_policy.py b/pytest_tests/testsuites/container/test_policy.py index 0029b388..3def93c4 100644 --- a/pytest_tests/testsuites/container/test_policy.py +++ b/pytest_tests/testsuites/container/test_policy.py @@ -17,14 +17,10 @@ from frostfs_testlib.utils.cli_utils import parse_netmap_output from frostfs_testlib.utils.file_utils import generate_file from pytest_tests.helpers.utility import placement_policy_from_container -from pytest_tests.resources.policy_error_patterns import ( - NOT_ENOUGH_TO_SELECT, - NOT_FOUND_FILTER, - NOT_FOUND_SELECTOR, - NOT_PARSE_POLICY, -) +from pytest_tests.resources.policy_error_patterns import NOT_ENOUGH_TO_SELECT, NOT_FOUND_FILTER, NOT_FOUND_SELECTOR, NOT_PARSE_POLICY +@pytest.mark.nightly @pytest.mark.container @pytest.mark.policy class TestPolicy(ClusterTestBase): @@ -93,7 +89,9 @@ class TestPolicy(ClusterTestBase): """ Negative test for placement policy: Filter not found. """ - placement_rule = "REP 2 IN HALF CBF 1 SELECT 2 FROM GT15 AS HALF FILTER @NOTRU AND Price GT 15 AS GT15 FILTER CountryCode NE RU AS NOTRU" + placement_rule = ( + "REP 2 IN HALF CBF 1 SELECT 2 FROM GT15 AS HALF FILTER @NOTRU AND Price GT 15 AS GT15 FILTER CountryCode NE RU AS NOTRU" + ) endpoint = self.cluster.default_rpc_endpoint with reporter.step(f"Create container with policy {placement_rule}"): with pytest.raises(Exception, match=NOT_FOUND_FILTER): @@ -137,9 +135,7 @@ class TestPolicy(ClusterTestBase): endpoint = self.cluster.default_rpc_endpoint with reporter.step(f"Create container with policy {placement_rule}"): - cid = create_container( - wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint - ) + cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint) with reporter.step(f"Check container policy"): self.validate_object_policy(default_wallet, placement_rule, cid, endpoint) @@ -149,9 +145,7 @@ class TestPolicy(ClusterTestBase): with reporter.step(f"Check object expected copies"): resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes) - assert ( - len(resulting_copies) == expected_copies - ), f"Expected {expected_copies} copies, got {len(resulting_copies)}" + assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}" with reporter.step(f"Delete the object from the container"): delete_object(wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, endpoint=endpoint) @@ -174,9 +168,7 @@ class TestPolicy(ClusterTestBase): endpoint = self.cluster.default_rpc_endpoint with reporter.step(f"Create container with policy {placement_rule}"): - cid = create_container( - wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint - ) + cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint) with reporter.step(f"Check container policy"): self.validate_object_policy(default_wallet, placement_rule, cid, endpoint) @@ -186,9 +178,7 @@ class TestPolicy(ClusterTestBase): with reporter.step(f"Check object expected copies"): resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes) - assert ( - len(resulting_copies) == expected_copies - ), f"Expected {expected_copies} copies, got {len(resulting_copies)}" + assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}" with reporter.step(f"Delete the object from the container"): delete_object(wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, endpoint=endpoint) @@ -212,9 +202,7 @@ class TestPolicy(ClusterTestBase): placement_params = {"country": "Russia"} with reporter.step(f"Create container with policy {placement_rule}"): - cid = create_container( - wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint - ) + cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint) with reporter.step(f"Check container policy"): self.validate_object_policy(default_wallet, placement_rule, cid, endpoint) @@ -224,9 +212,7 @@ class TestPolicy(ClusterTestBase): with reporter.step(f"Check object expected copies"): resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes) - assert ( - len(resulting_copies) == expected_copies - ), f"Expected {expected_copies} copies, got {len(resulting_copies)}" + assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}" with reporter.step(f"Check the object appearance"): netmap = parse_netmap_output(get_netmap_snapshot(node=resulting_copies[0], shell=self.shell)) @@ -259,9 +245,7 @@ class TestPolicy(ClusterTestBase): endpoint = self.cluster.default_rpc_endpoint with reporter.step(f"Create container with policy {placement_rule}"): - cid = create_container( - wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint - ) + cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint) with reporter.step(f"Check container policy"): self.validate_object_policy(default_wallet, placement_rule, cid, endpoint) @@ -271,9 +255,7 @@ class TestPolicy(ClusterTestBase): with reporter.step(f"Check object expected copies"): resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes) - assert ( - len(resulting_copies) == expected_copies - ), f"Expected {expected_copies} copies, got {len(resulting_copies)}" + assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}" with reporter.step(f"Check the object appearance"): netmap = parse_netmap_output(get_netmap_snapshot(node=resulting_copies[0], shell=self.shell)) @@ -309,9 +291,7 @@ class TestPolicy(ClusterTestBase): endpoint = self.cluster.default_rpc_endpoint with reporter.step(f"Create container with policy {placement_rule}"): - cid = create_container( - wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint - ) + cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint) with reporter.step(f"Check container policy"): self.validate_object_policy(default_wallet, placement_rule, cid, endpoint) @@ -321,9 +301,7 @@ class TestPolicy(ClusterTestBase): with reporter.step(f"Check object expected copies"): resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes) - assert ( - len(resulting_copies) == expected_copies - ), f"Expected {expected_copies} copies, got {len(resulting_copies)}" + assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}" with reporter.step(f"Check the object appearance"): netmap = parse_netmap_output(get_netmap_snapshot(node=resulting_copies[0], shell=self.shell)) @@ -359,9 +337,7 @@ class TestPolicy(ClusterTestBase): endpoint = self.cluster.default_rpc_endpoint with reporter.step(f"Create container with policy {placement_rule}"): - cid = create_container( - wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint - ) + cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint) with reporter.step(f"Check container policy"): self.validate_object_policy(default_wallet, placement_rule, cid, endpoint) @@ -371,9 +347,7 @@ class TestPolicy(ClusterTestBase): with reporter.step(f"Check object expected copies"): resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes) - assert ( - len(resulting_copies) == expected_copies - ), f"Expected {expected_copies} copies, got {len(resulting_copies)}" + assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}" with reporter.step(f"Check the object appearance"): netmap = parse_netmap_output(get_netmap_snapshot(node=resulting_copies[0], shell=self.shell)) @@ -406,9 +380,7 @@ class TestPolicy(ClusterTestBase): endpoint = self.cluster.default_rpc_endpoint with reporter.step(f"Create container with policy {placement_rule}"): - cid = create_container( - wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint - ) + cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint) with reporter.step(f"Check container policy"): self.validate_object_policy(default_wallet, placement_rule, cid, endpoint) @@ -418,9 +390,7 @@ class TestPolicy(ClusterTestBase): with reporter.step(f"Check object expected copies"): resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes) - assert ( - len(resulting_copies) == expected_copies - ), f"Expected {expected_copies} copies, got {len(resulting_copies)}" + assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}" with reporter.step(f"Delete the object from the container"): delete_object(wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, endpoint=endpoint) @@ -443,9 +413,7 @@ class TestPolicy(ClusterTestBase): endpoint = self.cluster.default_rpc_endpoint with reporter.step(f"Create container with policy {placement_rule}"): - cid = create_container( - wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint - ) + cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint) with reporter.step(f"Check container policy"): self.validate_object_policy(default_wallet, placement_rule, cid, endpoint) @@ -455,9 +423,7 @@ class TestPolicy(ClusterTestBase): with reporter.step(f"Check object expected copies"): resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes) - assert ( - len(resulting_copies) == expected_copies - ), f"Expected {expected_copies} copies, got {len(resulting_copies)}" + assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}" with reporter.step(f"Delete the object from the container"): delete_object(wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, endpoint=endpoint) @@ -482,9 +448,7 @@ class TestPolicy(ClusterTestBase): endpoint = self.cluster.default_rpc_endpoint with reporter.step(f"Create container with policy {placement_rule}"): - cid = create_container( - wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint - ) + cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint) with reporter.step(f"Check container policy"): self.validate_object_policy(default_wallet, placement_rule, cid, endpoint) @@ -494,9 +458,7 @@ class TestPolicy(ClusterTestBase): with reporter.step(f"Check object expected copies"): resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes) - assert ( - len(resulting_copies) == expected_copies - ), f"Expected {expected_copies} copies, got {len(resulting_copies)}" + assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}" with reporter.step(f"Check the object appearance"): netmap = parse_netmap_output(get_netmap_snapshot(node=resulting_copies[0], shell=self.shell)) @@ -530,9 +492,7 @@ class TestPolicy(ClusterTestBase): endpoint = self.cluster.default_rpc_endpoint with reporter.step(f"Create container with policy {placement_rule}"): - cid = create_container( - wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint - ) + cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint) with reporter.step(f"Check container policy"): self.validate_object_policy(default_wallet, placement_rule, cid, endpoint) @@ -542,9 +502,7 @@ class TestPolicy(ClusterTestBase): with reporter.step(f"Check object expected copies"): resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes) - assert ( - len(resulting_copies) == expected_copies - ), f"Expected {expected_copies} copies, got {len(resulting_copies)}" + assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}" with reporter.step(f"Check the object appearance"): netmap = parse_netmap_output(get_netmap_snapshot(node=resulting_copies[0], shell=self.shell)) @@ -580,9 +538,7 @@ class TestPolicy(ClusterTestBase): endpoint = self.cluster.default_rpc_endpoint with reporter.step(f"Create container with policy {placement_rule}"): - cid = create_container( - wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint - ) + cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint) with reporter.step(f"Check container policy"): self.validate_object_policy(default_wallet, placement_rule, cid, endpoint) @@ -592,9 +548,7 @@ class TestPolicy(ClusterTestBase): with reporter.step(f"Check object expected copies"): resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes) - assert ( - len(resulting_copies) == expected_copies - ), f"Expected {expected_copies} copies, got {len(resulting_copies)}" + assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}" with reporter.step(f"Check the object appearance"): netmap = parse_netmap_output(get_netmap_snapshot(node=resulting_copies[0], shell=self.shell)) @@ -628,9 +582,7 @@ class TestPolicy(ClusterTestBase): endpoint = self.cluster.default_rpc_endpoint with reporter.step(f"Create container with policy {placement_rule}"): - cid = create_container( - wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint - ) + cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint) with reporter.step(f"Check container policy"): self.validate_object_policy(default_wallet, placement_rule, cid, endpoint) @@ -640,9 +592,7 @@ class TestPolicy(ClusterTestBase): with reporter.step(f"Check object expected copies"): resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes) - assert ( - len(resulting_copies) == expected_copies - ), f"Expected {expected_copies} copies, got {len(resulting_copies)}" + assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}" with reporter.step(f"Delete the object from the container"): delete_object(wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, endpoint=endpoint) @@ -665,9 +615,7 @@ class TestPolicy(ClusterTestBase): endpoint = self.cluster.default_rpc_endpoint with reporter.step(f"Create container with policy {placement_rule}"): - cid = create_container( - wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint - ) + cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint) with reporter.step(f"Check container policy"): self.validate_object_policy(default_wallet, placement_rule, cid, endpoint) @@ -677,9 +625,7 @@ class TestPolicy(ClusterTestBase): with reporter.step(f"Check object expected copies"): resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes) - assert ( - len(resulting_copies) == expected_copies - ), f"Expected {expected_copies} copies, got {len(resulting_copies)}" + assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}" with reporter.step(f"Delete the object from the container"): delete_object(wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, endpoint=endpoint) @@ -704,9 +650,7 @@ class TestPolicy(ClusterTestBase): endpoint = self.cluster.default_rpc_endpoint with reporter.step(f"Create container with policy {placement_rule}"): - cid = create_container( - wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint - ) + cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint) with reporter.step(f"Check container policy"): self.validate_object_policy(default_wallet, placement_rule, cid, endpoint) @@ -716,9 +660,7 @@ class TestPolicy(ClusterTestBase): with reporter.step(f"Check object expected copies"): resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes) - assert ( - len(resulting_copies) == expected_copies - ), f"Expected {expected_copies} copies, got {len(resulting_copies)}" + assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}" with reporter.step(f"Check the object appearance"): netmap = parse_netmap_output(get_netmap_snapshot(node=resulting_copies[0], shell=self.shell)) @@ -746,16 +688,16 @@ class TestPolicy(ClusterTestBase): """ This test checks object's copies based on container's placement policy with SELECT and Complex FILTER results with 50% of available nodes. """ - placement_rule = "REP 2 IN HALF CBF 2 SELECT 2 FROM GE15 AS HALF FILTER CountryCode NE RU AS NOTRU FILTER @NOTRU AND Price GE 15 AS GE15" + placement_rule = ( + "REP 2 IN HALF CBF 2 SELECT 2 FROM GE15 AS HALF FILTER CountryCode NE RU AS NOTRU FILTER @NOTRU AND Price GE 15 AS GE15" + ) placement_params = {"Price": 15, "country_code": "RU"} file_path = generate_file(simple_object_size.value) expected_copies = 2 endpoint = self.cluster.default_rpc_endpoint with reporter.step(f"Create container with policy {placement_rule}"): - cid = create_container( - wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint - ) + cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint) with reporter.step(f"Check container policy"): self.validate_object_policy(default_wallet, placement_rule, cid, endpoint) @@ -765,16 +707,12 @@ class TestPolicy(ClusterTestBase): with reporter.step(f"Check object expected copies"): resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes) - assert ( - len(resulting_copies) == expected_copies - ), f"Expected {expected_copies} copies, got {len(resulting_copies)}" + assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}" with reporter.step(f"Check the object appearance"): netmap = parse_netmap_output(get_netmap_snapshot(node=resulting_copies[0], shell=self.shell)) netmap = self.get_netmap_param(netmap) - with reporter.step( - f"Check two nodes are selected not with country code '{placement_params['country_code']}'" - ): + with reporter.step(f"Check two nodes are selected not with country code '{placement_params['country_code']}'"): for node in resulting_copies: node_address = node.get_rpc_endpoint().split(":")[0] assert ( @@ -806,9 +744,7 @@ class TestPolicy(ClusterTestBase): endpoint = self.cluster.default_rpc_endpoint with reporter.step(f"Create container with policy {placement_rule}"): - cid = create_container( - wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint - ) + cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint) with reporter.step(f"Check container policy"): self.validate_object_policy(default_wallet, placement_rule, cid, endpoint) @@ -818,9 +754,7 @@ class TestPolicy(ClusterTestBase): with reporter.step(f"Check object expected copies"): resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes) - assert ( - len(resulting_copies) == expected_copies - ), f"Expected {expected_copies} copies, got {len(resulting_copies)}" + assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}" with reporter.step(f"Check the object appearance"): netmap = parse_netmap_output(get_netmap_snapshot(node=resulting_copies[0], shell=self.shell)) @@ -862,9 +796,7 @@ class TestPolicy(ClusterTestBase): endpoint = self.cluster.default_rpc_endpoint with reporter.step(f"Create container with policy {placement_rule}"): - cid = create_container( - wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint - ) + cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint) with reporter.step(f"Check container policy"): self.validate_object_policy(default_wallet, placement_rule, cid, endpoint) @@ -874,9 +806,7 @@ class TestPolicy(ClusterTestBase): with reporter.step(f"Check object expected copies"): resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes) - assert ( - len(resulting_copies) == expected_copies - ), f"Expected {expected_copies} copies, got {len(resulting_copies)}" + assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}" with reporter.step(f"Delete the object from the container"): delete_object(wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, endpoint=endpoint) @@ -899,9 +829,7 @@ class TestPolicy(ClusterTestBase): endpoint = self.cluster.default_rpc_endpoint with reporter.step(f"Create container with policy {placement_rule}"): - cid = create_container( - wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint - ) + cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint) with reporter.step(f"Check container policy"): self.validate_object_policy(default_wallet, placement_rule, cid, endpoint) @@ -911,9 +839,7 @@ class TestPolicy(ClusterTestBase): with reporter.step(f"Check object expected copies"): resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes) - assert ( - len(resulting_copies) == expected_copies - ), f"Expected {expected_copies} copies, got {len(resulting_copies)}" + assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}" with reporter.step(f"Delete the object from the container"): delete_object(wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, endpoint=endpoint) @@ -938,9 +864,7 @@ class TestPolicy(ClusterTestBase): endpoint = self.cluster.default_rpc_endpoint with reporter.step(f"Create container with policy {placement_rule}"): - cid = create_container( - wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint - ) + cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint) with reporter.step(f"Check container policy"): self.validate_object_policy(default_wallet, placement_rule, cid, endpoint) @@ -950,9 +874,7 @@ class TestPolicy(ClusterTestBase): with reporter.step(f"Check object expected copies"): resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes) - assert ( - len(resulting_copies) == expected_copies - ), f"Expected {expected_copies} copies, got {len(resulting_copies)}" + assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}" with reporter.step(f"Check the object appearance"): netmap = parse_netmap_output(get_netmap_snapshot(node=resulting_copies[0], shell=self.shell)) @@ -980,16 +902,16 @@ class TestPolicy(ClusterTestBase): """ This test checks object's copies based on container's placement policy with SELECT and Complex FILTER results with 75% of available nodes. """ - placement_rule = "REP 2 IN NODES75 SELECT 2 FROM LT65 AS NODES75 FILTER Continent NE America AS NOAM FILTER @NOAM AND Price LT 65 AS LT65" + placement_rule = ( + "REP 2 IN NODES75 SELECT 2 FROM LT65 AS NODES75 FILTER Continent NE America AS NOAM FILTER @NOAM AND Price LT 65 AS LT65" + ) placement_params = {"Price": 65, "continent": "America"} file_path = generate_file(simple_object_size.value) expected_copies = 2 endpoint = self.cluster.default_rpc_endpoint with reporter.step(f"Create container with policy {placement_rule}"): - cid = create_container( - wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint - ) + cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint) with reporter.step(f"Check container policy"): self.validate_object_policy(default_wallet, placement_rule, cid, endpoint) @@ -999,9 +921,7 @@ class TestPolicy(ClusterTestBase): with reporter.step(f"Check object expected copies"): resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes) - assert ( - len(resulting_copies) == expected_copies - ), f"Expected {expected_copies} copies, got {len(resulting_copies)}" + assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}" with reporter.step(f"Check the object appearance"): netmap = parse_netmap_output(get_netmap_snapshot(node=resulting_copies[0], shell=self.shell)) @@ -1039,9 +959,7 @@ class TestPolicy(ClusterTestBase): endpoint = self.cluster.default_rpc_endpoint with reporter.step(f"Create container with policy {placement_rule}"): - cid = create_container( - wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint - ) + cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint) with reporter.step(f"Check container policy"): self.validate_object_policy(default_wallet, placement_rule, cid, endpoint) @@ -1051,9 +969,7 @@ class TestPolicy(ClusterTestBase): with reporter.step(f"Check object expected copies"): resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes) - assert ( - len(resulting_copies) == expected_copies - ), f"Expected {expected_copies} copies, got {len(resulting_copies)}" + assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}" with reporter.step(f"Check the object appearance"): netmap = parse_netmap_output(get_netmap_snapshot(node=resulting_copies[0], shell=self.shell)) @@ -1094,9 +1010,7 @@ class TestPolicy(ClusterTestBase): endpoint = self.cluster.default_rpc_endpoint with reporter.step(f"Create container with policy {placement_rule}"): - cid = create_container( - wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint - ) + cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint) with reporter.step(f"Check container policy"): self.validate_object_policy(default_wallet, placement_rule, cid, endpoint) @@ -1106,9 +1020,7 @@ class TestPolicy(ClusterTestBase): with reporter.step(f"Check object expected copies"): resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes) - assert ( - len(resulting_copies) == expected_copies - ), f"Expected {expected_copies} copies, got {len(resulting_copies)}" + assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}" with reporter.step(f"Delete the object from the container"): delete_object(wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, endpoint=endpoint) @@ -1131,9 +1043,7 @@ class TestPolicy(ClusterTestBase): endpoint = self.cluster.default_rpc_endpoint with reporter.step(f"Create container with policy {placement_rule}"): - cid = create_container( - wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint - ) + cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint) with reporter.step(f"Check container policy"): self.validate_object_policy(default_wallet, placement_rule, cid, endpoint) @@ -1143,9 +1053,7 @@ class TestPolicy(ClusterTestBase): with reporter.step(f"Check object expected copies"): resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes) - assert ( - len(resulting_copies) == expected_copies - ), f"Expected {expected_copies} copies, got {len(resulting_copies)}" + assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}" with reporter.step(f"Delete the object from the container"): delete_object(wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, endpoint=endpoint) @@ -1170,9 +1078,7 @@ class TestPolicy(ClusterTestBase): endpoint = self.cluster.default_rpc_endpoint with reporter.step(f"Create container with policy {placement_rule}"): - cid = create_container( - wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint - ) + cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint) with reporter.step(f"Check container policy"): self.validate_object_policy(default_wallet, placement_rule, cid, endpoint) @@ -1182,9 +1088,7 @@ class TestPolicy(ClusterTestBase): with reporter.step(f"Check object expected copies"): resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes) - assert ( - len(resulting_copies) == expected_copies - ), f"Expected {expected_copies} copies, got {len(resulting_copies)}" + assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}" with reporter.step(f"Check the object appearance"): netmap = parse_netmap_output(get_netmap_snapshot(node=resulting_copies[0], shell=self.shell)) @@ -1217,9 +1121,7 @@ class TestPolicy(ClusterTestBase): endpoint = self.cluster.default_rpc_endpoint with reporter.step(f"Create container with policy {placement_rule}"): - cid = create_container( - wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint - ) + cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint) with reporter.step(f"Check container policy"): self.validate_object_policy(default_wallet, placement_rule, cid, endpoint) @@ -1229,9 +1131,7 @@ class TestPolicy(ClusterTestBase): with reporter.step(f"Check object expected copies"): resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes) - assert ( - len(resulting_copies) == expected_copies - ), f"Expected {expected_copies} copies, got {len(resulting_copies)}" + assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}" with reporter.step(f"Check the object appearance"): netmap = parse_netmap_output(get_netmap_snapshot(node=resulting_copies[0], shell=self.shell)) @@ -1268,9 +1168,7 @@ class TestPolicy(ClusterTestBase): endpoint = self.cluster.default_rpc_endpoint with reporter.step(f"Create container with policy {placement_rule}"): - cid = create_container( - wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint - ) + cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint) with reporter.step(f"Check container policy"): self.validate_object_policy(default_wallet, placement_rule, cid, endpoint) @@ -1280,9 +1178,7 @@ class TestPolicy(ClusterTestBase): with reporter.step(f"Check object expected copies"): resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes) - assert ( - len(resulting_copies) == expected_copies - ), f"Expected {expected_copies} copies, got {len(resulting_copies)}" + assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}" with reporter.step(f"Check the object appearance"): netmap = parse_netmap_output(get_netmap_snapshot(node=resulting_copies[0], shell=self.shell)) @@ -1315,9 +1211,7 @@ class TestPolicy(ClusterTestBase): endpoint = self.cluster.default_rpc_endpoint with reporter.step(f"Create container with policy {placement_rule}"): - cid = create_container( - wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint - ) + cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint) with reporter.step(f"Check container policy"): self.validate_object_policy(default_wallet, placement_rule, cid, endpoint) @@ -1327,9 +1221,7 @@ class TestPolicy(ClusterTestBase): with reporter.step(f"Check object expected copies"): resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes) - assert ( - len(resulting_copies) == expected_copies - ), f"Expected {expected_copies} copies, got {len(resulting_copies)}" + assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}" with reporter.step(f"Delete the object from the container"): delete_object(wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, endpoint=endpoint) @@ -1352,9 +1244,7 @@ class TestPolicy(ClusterTestBase): endpoint = self.cluster.default_rpc_endpoint with reporter.step(f"Create container with policy {placement_rule}"): - cid = create_container( - wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint - ) + cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint) with reporter.step(f"Check container policy"): self.validate_object_policy(default_wallet, placement_rule, cid, endpoint) @@ -1364,9 +1254,7 @@ class TestPolicy(ClusterTestBase): with reporter.step(f"Check object expected copies"): resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes) - assert ( - len(resulting_copies) == expected_copies - ), f"Expected {expected_copies} copies, got {len(resulting_copies)}" + assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}" with reporter.step(f"Delete the object from the container"): delete_object(wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, endpoint=endpoint) @@ -1390,9 +1278,7 @@ class TestPolicy(ClusterTestBase): endpoint = self.cluster.default_rpc_endpoint with reporter.step(f"Create container with policy {placement_rule}"): - cid = create_container( - wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint - ) + cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint) with reporter.step(f"Check container policy"): self.validate_object_policy(default_wallet, placement_rule, cid, endpoint) @@ -1402,9 +1288,7 @@ class TestPolicy(ClusterTestBase): with reporter.step(f"Check object expected copies"): resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes) - assert ( - len(resulting_copies) == expected_copies - ), f"Expected {expected_copies} copies, got {len(resulting_copies)}" + assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}" with reporter.step(f"Check the object appearance"): netmap = parse_netmap_output(get_netmap_snapshot(node=resulting_copies[0], shell=self.shell)) @@ -1440,9 +1324,7 @@ class TestPolicy(ClusterTestBase): endpoint = self.cluster.default_rpc_endpoint with reporter.step(f"Create container with policy {placement_rule}"): - cid = create_container( - wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint - ) + cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint) with reporter.step(f"Check container policy"): self.validate_object_policy(default_wallet, placement_rule, cid, endpoint) @@ -1452,9 +1334,7 @@ class TestPolicy(ClusterTestBase): with reporter.step(f"Check object expected copies"): resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes) - assert ( - len(resulting_copies) == expected_copies - ), f"Expected {expected_copies} copies, got {len(resulting_copies)}" + assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}" with reporter.step(f"Check the object appearance"): netmap = parse_netmap_output(get_netmap_snapshot(node=resulting_copies[0], shell=self.shell)) @@ -1490,9 +1370,7 @@ class TestPolicy(ClusterTestBase): endpoint = self.cluster.default_rpc_endpoint with reporter.step(f"Create container with policy {placement_rule}"): - cid = create_container( - wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint - ) + cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint) with reporter.step(f"Check container policy"): self.validate_object_policy(default_wallet, placement_rule, cid, endpoint) @@ -1528,9 +1406,7 @@ class TestPolicy(ClusterTestBase): delete_container(wallet=default_wallet, cid=cid, shell=self.shell, endpoint=endpoint) def validate_object_policy(self, wallet: str, placement_rule: str, cid: str, endpoint: str): - got_policy = placement_policy_from_container( - get_container(wallet, cid, json_mode=False, shell=self.shell, endpoint=endpoint) - ) + got_policy = placement_policy_from_container(get_container(wallet, cid, json_mode=False, shell=self.shell, endpoint=endpoint)) assert got_policy.replace("'", "") == placement_rule.replace( "'", "" ), f"Expected \n{placement_rule} and got policy \n{got_policy} are the same" diff --git a/pytest_tests/testsuites/metrics/test_container_metrics.py b/pytest_tests/testsuites/metrics/test_container_metrics.py index 7e654000..d2dd56b1 100644 --- a/pytest_tests/testsuites/metrics/test_container_metrics.py +++ b/pytest_tests/testsuites/metrics/test_container_metrics.py @@ -17,6 +17,7 @@ from frostfs_testlib.utils.file_utils import generate_file from ...helpers.utility import are_numbers_similar +@pytest.mark.nightly @pytest.mark.container class TestContainerMetrics(ClusterTestBase): @reporter.step("Put object to container: {cid}") diff --git a/pytest_tests/testsuites/metrics/test_garbage_collector_metrics.py b/pytest_tests/testsuites/metrics/test_garbage_collector_metrics.py index 58d0be94..db5d9632 100644 --- a/pytest_tests/testsuites/metrics/test_garbage_collector_metrics.py +++ b/pytest_tests/testsuites/metrics/test_garbage_collector_metrics.py @@ -16,6 +16,7 @@ from frostfs_testlib.testing.test_control import wait_for_success from frostfs_testlib.utils.file_utils import generate_file +@pytest.mark.nightly class TestGarbageCollectorMetrics(ClusterTestBase): @wait_for_success(interval=10) def check_metrics_in_node(self, cluster_node: ClusterNode, counter_exp: int, **metrics_greps: str): diff --git a/pytest_tests/testsuites/metrics/test_grpc_metrics.py b/pytest_tests/testsuites/metrics/test_grpc_metrics.py index e4a16c09..b98f456e 100644 --- a/pytest_tests/testsuites/metrics/test_grpc_metrics.py +++ b/pytest_tests/testsuites/metrics/test_grpc_metrics.py @@ -18,6 +18,7 @@ from frostfs_testlib.testing.cluster_test_base import ClusterTestBase from frostfs_testlib.utils.file_utils import generate_file +@pytest.mark.nightly class TestGRPCMetrics(ClusterTestBase): @pytest.fixture def disable_policer(self, cluster_state_controller: ClusterStateController): @@ -34,9 +35,7 @@ class TestGRPCMetrics(ClusterTestBase): node = random.choice(cluster.cluster_nodes) with reporter.step("Get current gRPC metrics for method 'Put'"): - metrics_counter_put = get_metrics_value( - node, command="grpc_server_handled_total", service="ContainerService", method="Put" - ) + metrics_counter_put = get_metrics_value(node, command="grpc_server_handled_total", service="ContainerService", method="Put") with reporter.step(f"Create container with policy {placement_policy}"): cid = create_container(default_wallet, self.shell, node.storage_node.get_rpc_endpoint(), placement_policy) @@ -52,9 +51,7 @@ class TestGRPCMetrics(ClusterTestBase): ) with reporter.step("Get current gRPC metrics for method 'Get'"): - metrics_counter_get = get_metrics_value( - node, command="grpc_server_handled_total", service="ContainerService", method="Get" - ) + metrics_counter_get = get_metrics_value(node, command="grpc_server_handled_total", service="ContainerService", method="Get") with reporter.step(f"Get container"): get_container(default_wallet, cid, self.shell, node.storage_node.get_rpc_endpoint()) @@ -70,9 +67,7 @@ class TestGRPCMetrics(ClusterTestBase): ) with reporter.step("Get current gRPC metrics for method 'List'"): - metrics_counter_list = get_metrics_value( - node, command="grpc_server_handled_total", service="ContainerService", method="List" - ) + metrics_counter_list = get_metrics_value(node, command="grpc_server_handled_total", service="ContainerService", method="List") with reporter.step(f"Get container list"): list_containers(default_wallet, self.shell, node.storage_node.get_rpc_endpoint()) @@ -101,9 +96,7 @@ class TestGRPCMetrics(ClusterTestBase): cid = create_container(default_wallet, self.shell, node.storage_node.get_rpc_endpoint(), placement_policy) with reporter.step("Get current gRPC metrics for method 'Put'"): - metrics_counter_put = get_metrics_value( - node, command="grpc_server_handled_total", service="ObjectService", method="Put" - ) + metrics_counter_put = get_metrics_value(node, command="grpc_server_handled_total", service="ObjectService", method="Put") with reporter.step("Put object to selected node"): oid = put_object(default_wallet, file_path, cid, self.shell, node.storage_node.get_rpc_endpoint()) @@ -119,9 +112,7 @@ class TestGRPCMetrics(ClusterTestBase): ) with reporter.step("Get current gRPC metrics for method 'Get'"): - metrics_counter_get = get_metrics_value( - node, command="grpc_server_handled_total", service="ObjectService", method="Get" - ) + metrics_counter_get = get_metrics_value(node, command="grpc_server_handled_total", service="ObjectService", method="Get") with reporter.step(f"Get object"): get_object(default_wallet, cid, oid, self.shell, node.storage_node.get_rpc_endpoint()) @@ -137,9 +128,7 @@ class TestGRPCMetrics(ClusterTestBase): ) with reporter.step("Get current gRPC metrics for method 'Search'"): - metrics_counter_search = get_metrics_value( - node, command="grpc_server_handled_total", service="ObjectService", method="Search" - ) + metrics_counter_search = get_metrics_value(node, command="grpc_server_handled_total", service="ObjectService", method="Search") with reporter.step(f"Search object"): search_object(default_wallet, cid, self.shell, node.storage_node.get_rpc_endpoint()) @@ -155,9 +144,7 @@ class TestGRPCMetrics(ClusterTestBase): ) with reporter.step("Get current gRPC metrics for method 'Head'"): - metrics_counter_head = get_metrics_value( - node, command="grpc_server_handled_total", service="ObjectService", method="Head" - ) + metrics_counter_head = get_metrics_value(node, command="grpc_server_handled_total", service="ObjectService", method="Head") with reporter.step(f"Head object"): head_object(default_wallet, cid, oid, self.shell, node.storage_node.get_rpc_endpoint()) @@ -178,9 +165,7 @@ class TestGRPCMetrics(ClusterTestBase): node = random.choice(cluster.cluster_nodes) with reporter.step("Get current gRPC metrics for Healthcheck"): - metrics_counter = get_metrics_value( - node, command="grpc_server_handled_total", service="TreeService", method="Healthcheck" - ) + metrics_counter = get_metrics_value(node, command="grpc_server_handled_total", service="TreeService", method="Healthcheck") with reporter.step("Query Tree healthcheck status"): healthcheck.tree_healthcheck(node) @@ -206,9 +191,7 @@ class TestGRPCMetrics(ClusterTestBase): cid = create_container(default_wallet, self.shell, node.storage_node.get_rpc_endpoint(), placement_policy) with reporter.step("Get current gRPC metrics for Tree List"): - metrics_counter = get_metrics_value( - node, command="grpc_server_handled_total", service="TreeService", method="TreeList" - ) + metrics_counter = get_metrics_value(node, command="grpc_server_handled_total", service="TreeService", method="TreeList") with reporter.step("Query Tree List"): get_tree_list(default_wallet, cid, self.shell, node.storage_node.get_rpc_endpoint()) diff --git a/pytest_tests/testsuites/metrics/test_logs_metrics.py b/pytest_tests/testsuites/metrics/test_logs_metrics.py index 795d0971..1436fa06 100644 --- a/pytest_tests/testsuites/metrics/test_logs_metrics.py +++ b/pytest_tests/testsuites/metrics/test_logs_metrics.py @@ -14,6 +14,7 @@ from frostfs_testlib.testing.cluster_test_base import ClusterTestBase from frostfs_testlib.testing.test_control import wait_for_success +@pytest.mark.nightly class TestLogsMetrics(ClusterTestBase): @pytest.fixture def revert_all(self, cluster_state_controller: ClusterStateController): diff --git a/pytest_tests/testsuites/metrics/test_object_metrics.py b/pytest_tests/testsuites/metrics/test_object_metrics.py index aba6ab46..a4da3037 100644 --- a/pytest_tests/testsuites/metrics/test_object_metrics.py +++ b/pytest_tests/testsuites/metrics/test_object_metrics.py @@ -16,6 +16,7 @@ from frostfs_testlib.testing.cluster_test_base import ClusterTestBase from frostfs_testlib.utils.file_utils import generate_file +@pytest.mark.nightly class TestObjectMetrics(ClusterTestBase): @allure.title("Object metrics of removed container (obj_size={object_size})") def test_object_metrics_removed_container(self, object_size: ObjectSize, default_wallet: WalletInfo, cluster: Cluster): diff --git a/pytest_tests/testsuites/metrics/test_shard_metrics.py b/pytest_tests/testsuites/metrics/test_shard_metrics.py index c6bd76ab..fce6e73d 100644 --- a/pytest_tests/testsuites/metrics/test_shard_metrics.py +++ b/pytest_tests/testsuites/metrics/test_shard_metrics.py @@ -19,6 +19,7 @@ from frostfs_testlib.testing.cluster_test_base import ClusterTestBase from frostfs_testlib.utils.file_utils import generate_file +@pytest.mark.nightly class TestShardMetrics(ClusterTestBase): @pytest.fixture() @allure.title("Get two shards for set mode") @@ -73,9 +74,7 @@ class TestShardMetrics(ClusterTestBase): data_path = node.storage_node.get_data_directory() all_datas = node_shell.exec(f"ls -la {data_path}/data | awk '{{ print $9 }}'").stdout.strip() for data_dir in all_datas.replace(".", "").strip().split("\n"): - check_dir = node_shell.exec( - f" [ -d {data_path}/data/{data_dir}/data/{oid_path} ] && echo 1 || echo 0" - ).stdout + check_dir = node_shell.exec(f" [ -d {data_path}/data/{data_dir}/data/{oid_path} ] && echo 1 || echo 0").stdout if "1" in check_dir: object_path = f"{data_path}/data/{data_dir}/data/{oid_path}" object_name = f"{oid[4:]}.{cid}" @@ -128,9 +127,7 @@ class TestShardMetrics(ClusterTestBase): ) @allure.title("Metric for error count on shard") - def test_shard_metrics_error_count( - self, max_object_size: int, default_wallet: WalletInfo, cluster: Cluster, revert_all_shards_mode - ): + def test_shard_metrics_error_count(self, max_object_size: int, default_wallet: WalletInfo, cluster: Cluster, revert_all_shards_mode): file_path = generate_file(round(max_object_size * 0.8)) with reporter.step(f"Create container"): @@ -147,11 +144,7 @@ class TestShardMetrics(ClusterTestBase): with reporter.step("Get object nodes"): object_storage_nodes = get_nodes_with_object(cid, oid, self.shell, cluster.storage_nodes) - object_nodes = [ - cluster_node - for cluster_node in cluster.cluster_nodes - if cluster_node.storage_node in object_storage_nodes - ] + object_nodes = [cluster_node for cluster_node in cluster.cluster_nodes if cluster_node.storage_node in object_storage_nodes] node = random.choice(object_nodes) with reporter.step("Search object in system."): diff --git a/pytest_tests/testsuites/object/test_object_api.py b/pytest_tests/testsuites/object/test_object_api.py index 1a82f401..e438e730 100755 --- a/pytest_tests/testsuites/object/test_object_api.py +++ b/pytest_tests/testsuites/object/test_object_api.py @@ -54,9 +54,7 @@ RANGE_MAX_LEN = 500 STATIC_RANGES = {} -def generate_ranges( - storage_object: StorageObjectInfo, max_object_size: int, shell: Shell, cluster: Cluster -) -> list[(int, int)]: +def generate_ranges(storage_object: StorageObjectInfo, max_object_size: int, shell: Shell, cluster: Cluster) -> list[(int, int)]: file_range_step = storage_object.size / RANGES_COUNT file_ranges = [] @@ -101,12 +99,8 @@ def common_container(default_wallet: WalletInfo, client_shell: Shell, cluster: C @pytest.fixture(scope="module") -def container_nodes( - default_wallet: WalletInfo, client_shell: Shell, cluster: Cluster, common_container: str -) -> list[ClusterNode]: - return search_nodes_with_container( - default_wallet, common_container, client_shell, cluster.default_rpc_endpoint, cluster - ) +def container_nodes(default_wallet: WalletInfo, client_shell: Shell, cluster: Cluster, common_container: str) -> list[ClusterNode]: + return search_nodes_with_container(default_wallet, common_container, client_shell, cluster.default_rpc_endpoint, cluster) @pytest.fixture(scope="module") @@ -127,9 +121,7 @@ def storage_objects( ) -> list[StorageObjectInfo]: wallet = default_wallet # Separate containers for complex/simple objects to avoid side-effects - cid = create_container( - wallet, shell=client_shell, rule=placement_policy.value, endpoint=cluster.default_rpc_endpoint - ) + cid = create_container(wallet, shell=client_shell, rule=placement_policy.value, endpoint=cluster.default_rpc_endpoint) file_path = generate_file(object_size.value) file_hash = get_file_hash(file_path) @@ -170,6 +162,7 @@ def expected_object_copies(placement_policy: PlacementPolicy) -> int: return 4 +@pytest.mark.nightly @pytest.mark.sanity @pytest.mark.grpc_api class TestObjectApi(ClusterTestBase): @@ -251,9 +244,7 @@ class TestObjectApi(ClusterTestBase): @allure.title("Head deleted object with --raw arg (obj_size={object_size}, policy={placement_policy})") def test_object_head_raw(self, default_wallet: str, object_size: ObjectSize, placement_policy: PlacementPolicy): with reporter.step("Create container"): - cid = create_container( - default_wallet, self.shell, self.cluster.default_rpc_endpoint, placement_policy.value - ) + cid = create_container(default_wallet, self.shell, self.cluster.default_rpc_endpoint, placement_policy.value) with reporter.step("Upload object"): file_path = generate_file(object_size.value) @@ -356,9 +347,7 @@ class TestObjectApi(ClusterTestBase): endpoint=self.cluster.default_rpc_endpoint, )["header"] object_type = header["objectType"] - assert ( - object_type == "TOMBSTONE" - ), f"Object wasn't deleted properly. Found object {tombstone_oid} with type {object_type}" + assert object_type == "TOMBSTONE", f"Object wasn't deleted properly. Found object {tombstone_oid} with type {object_type}" @allure.title("Get range hash by native API (obj_size={object_size}, policy={placement_policy})") @pytest.mark.grpc_api @@ -419,8 +408,7 @@ class TestObjectApi(ClusterTestBase): range_cut=range_cut, ) assert ( - get_file_content(file_path, content_len=range_len, mode="rb", offset=range_start) - == range_content + get_file_content(file_path, content_len=range_len, mode="rb", offset=range_start) == range_content ), f"Expected range content to match {range_cut} slice of file payload" @allure.title("[NEGATIVE] Get invalid range by native API (obj_size={object_size}, policy={placement_policy})") @@ -438,9 +426,7 @@ class TestObjectApi(ClusterTestBase): oids = [storage_object.oid for storage_object in storage_objects[:2]] file_size = storage_objects[0].size - assert ( - RANGE_MIN_LEN < file_size - ), f"Incorrect test setup. File size ({file_size}) is less than RANGE_MIN_LEN ({RANGE_MIN_LEN})" + assert RANGE_MIN_LEN < file_size, f"Incorrect test setup. File size ({file_size}) is less than RANGE_MIN_LEN ({RANGE_MIN_LEN})" file_ranges_to_test: list[tuple(int, int, str)] = [ # Offset is bigger than the file size, the length is small. @@ -485,9 +471,7 @@ class TestObjectApi(ClusterTestBase): oids = [storage_object.oid for storage_object in storage_objects[:2]] file_size = storage_objects[0].size - assert ( - RANGE_MIN_LEN < file_size - ), f"Incorrect test setup. File size ({file_size}) is less than RANGE_MIN_LEN ({RANGE_MIN_LEN})" + assert RANGE_MIN_LEN < file_size, f"Incorrect test setup. File size ({file_size}) is less than RANGE_MIN_LEN ({RANGE_MIN_LEN})" file_ranges_to_test: list[tuple(int, int, str)] = [ # Offset is bigger than the file size, the length is small. @@ -530,9 +514,7 @@ class TestObjectApi(ClusterTestBase): with reporter.step("Put object to container"): container_node = random.choice(container_nodes) - oid = put_object( - default_wallet, file_path, common_container, self.shell, container_node.storage_node.get_rpc_endpoint() - ) + oid = put_object(default_wallet, file_path, common_container, self.shell, container_node.storage_node.get_rpc_endpoint()) with reporter.step("Get range from container node endpoint"): get_range( @@ -567,9 +549,7 @@ class TestObjectApi(ClusterTestBase): with reporter.step("Put object to container"): container_node = random.choice(container_nodes) - oid = put_object( - default_wallet, file_path, common_container, self.shell, container_node.storage_node.get_rpc_endpoint() - ) + oid = put_object(default_wallet, file_path, common_container, self.shell, container_node.storage_node.get_rpc_endpoint()) with reporter.step("Get range hash from container node endpoint"): get_range_hash( @@ -595,6 +575,4 @@ class TestObjectApi(ClusterTestBase): def check_header_is_presented(self, head_info: dict, object_header: dict) -> None: for key_to_check, val_to_check in object_header.items(): assert key_to_check in head_info["header"]["attributes"], f"Key {key_to_check} is found in {head_object}" - assert head_info["header"]["attributes"].get(key_to_check) == str( - val_to_check - ), f"Value {val_to_check} is equal" + assert head_info["header"]["attributes"].get(key_to_check) == str(val_to_check), f"Value {val_to_check} is equal" diff --git a/pytest_tests/testsuites/object/test_object_api_bearer.py b/pytest_tests/testsuites/object/test_object_api_bearer.py index fe0bb85b..694dcefc 100644 --- a/pytest_tests/testsuites/object/test_object_api_bearer.py +++ b/pytest_tests/testsuites/object/test_object_api_bearer.py @@ -62,7 +62,7 @@ def storage_objects( return storage_objects -@pytest.mark.smoke +@pytest.mark.nightly @pytest.mark.bearer @pytest.mark.ape class TestObjectApiWithBearerToken(ClusterTestBase): diff --git a/pytest_tests/testsuites/object/test_object_lifetime.py b/pytest_tests/testsuites/object/test_object_lifetime.py index 09536d54..ce4d40ad 100644 --- a/pytest_tests/testsuites/object/test_object_lifetime.py +++ b/pytest_tests/testsuites/object/test_object_lifetime.py @@ -17,6 +17,7 @@ from pytest_tests.helpers.utility import wait_for_gc_pass_on_storage_nodes logger = logging.getLogger("NeoLogger") +@pytest.mark.nightly @pytest.mark.sanity @pytest.mark.grpc_api class TestObjectApiLifetime(ClusterTestBase): diff --git a/pytest_tests/testsuites/object/test_object_lock.py b/pytest_tests/testsuites/object/test_object_lock.py index ea78d9da..ef602184 100755 --- a/pytest_tests/testsuites/object/test_object_lock.py +++ b/pytest_tests/testsuites/object/test_object_lock.py @@ -131,6 +131,7 @@ def verify_object_available(wallet: WalletInfo, cid: str, oid: str, shell: Shell ) +@pytest.mark.nightly @pytest.mark.grpc_object_lock class TestObjectLockWithGrpc(ClusterTestBase): @pytest.fixture() diff --git a/pytest_tests/testsuites/object/test_object_without_user.py b/pytest_tests/testsuites/object/test_object_without_user.py index 4dfd74f6..98bf39f4 100644 --- a/pytest_tests/testsuites/object/test_object_without_user.py +++ b/pytest_tests/testsuites/object/test_object_without_user.py @@ -18,6 +18,7 @@ from frostfs_testlib.utils.file_utils import TestFile, get_file_hash logger = logging.getLogger("NeoLogger") +@pytest.mark.nightly @pytest.mark.grpc_without_user class TestObjectApiWithoutUser(ClusterTestBase): def _parse_oid(self, stdout: str) -> str: diff --git a/pytest_tests/testsuites/replication/test_ec_replication.py b/pytest_tests/testsuites/replication/test_ec_replication.py index e27ba6b2..8e243a8d 100644 --- a/pytest_tests/testsuites/replication/test_ec_replication.py +++ b/pytest_tests/testsuites/replication/test_ec_replication.py @@ -50,6 +50,7 @@ def frostfs_remote_adm(cluster: Cluster) -> FrostfsAdm: return FrostfsAdm(shell, frostfs_adm_exec_path=FROSTFS_ADM_EXEC, config_file=FROSTFS_ADM_CONFIG_PATH) +@pytest.mark.nightly @pytest.mark.replication @pytest.mark.ec_replication class TestECReplication(ClusterTestBase): diff --git a/pytest_tests/testsuites/services/http_gate/test_http_gate.py b/pytest_tests/testsuites/services/http_gate/test_http_gate.py index a503e926..1bd736dd 100644 --- a/pytest_tests/testsuites/services/http_gate/test_http_gate.py +++ b/pytest_tests/testsuites/services/http_gate/test_http_gate.py @@ -31,6 +31,7 @@ OBJECT_NOT_FOUND_ERROR = "not found" ) @allure.link("https://git.frostfs.info/TrueCloudLab/frostfs-http-gw#uploading", name="uploading") @allure.link("https://git.frostfs.info/TrueCloudLab/frostfs-http-gw#downloading", name="downloading") +@pytest.mark.nightly @pytest.mark.sanity @pytest.mark.http_gate class TestHttpGate(ClusterTestBase): @@ -133,12 +134,8 @@ class TestHttpPut(ClusterTestBase): file_path_large = generate_file(complex_object_size.value) with reporter.step("Put objects using HTTP"): - oid_simple = upload_via_http_gate( - cid=cid, path=file_path_simple, endpoint=self.cluster.default_http_gate_endpoint - ) - oid_large = upload_via_http_gate( - cid=cid, path=file_path_large, endpoint=self.cluster.default_http_gate_endpoint - ) + oid_simple = upload_via_http_gate(cid=cid, path=file_path_simple, endpoint=self.cluster.default_http_gate_endpoint) + oid_large = upload_via_http_gate(cid=cid, path=file_path_large, endpoint=self.cluster.default_http_gate_endpoint) for oid, file_path in ((oid_simple, file_path_simple), (oid_large, file_path_large)): verify_object_hash( @@ -353,9 +350,7 @@ class TestHttpPut(ClusterTestBase): file_path_large = generate_file(complex_object_size.value) with reporter.step("Put objects using curl utility"): - oid_simple = upload_via_http_gate_curl( - cid=cid, filepath=file_path_simple, endpoint=self.cluster.default_http_gate_endpoint - ) + oid_simple = upload_via_http_gate_curl(cid=cid, filepath=file_path_simple, endpoint=self.cluster.default_http_gate_endpoint) oid_large = upload_via_http_gate_curl( cid=cid, filepath=file_path_large, diff --git a/pytest_tests/testsuites/services/http_gate/test_http_object.py b/pytest_tests/testsuites/services/http_gate/test_http_object.py index dfceb378..0653c6ef 100644 --- a/pytest_tests/testsuites/services/http_gate/test_http_object.py +++ b/pytest_tests/testsuites/services/http_gate/test_http_object.py @@ -22,6 +22,7 @@ from frostfs_testlib.utils.file_utils import generate_file logger = logging.getLogger("NeoLogger") +@pytest.mark.nightly @pytest.mark.sanity @pytest.mark.http_gate class Test_http_object(ClusterTestBase): diff --git a/pytest_tests/testsuites/services/s3_gate/test_s3_ACL.py b/pytest_tests/testsuites/services/s3_gate/test_s3_ACL.py index b43a65bf..f5d84fd5 100644 --- a/pytest_tests/testsuites/services/s3_gate/test_s3_ACL.py +++ b/pytest_tests/testsuites/services/s3_gate/test_s3_ACL.py @@ -9,6 +9,7 @@ from frostfs_testlib.storage.dataclasses.object_size import ObjectSize from frostfs_testlib.utils.file_utils import generate_file +@pytest.mark.nightly @pytest.mark.acl @pytest.mark.s3_gate class TestS3GateACL: diff --git a/pytest_tests/testsuites/services/s3_gate/test_s3_bucket.py b/pytest_tests/testsuites/services/s3_gate/test_s3_bucket.py index f8511680..0824f44a 100644 --- a/pytest_tests/testsuites/services/s3_gate/test_s3_bucket.py +++ b/pytest_tests/testsuites/services/s3_gate/test_s3_bucket.py @@ -9,6 +9,7 @@ from frostfs_testlib.storage.dataclasses.object_size import ObjectSize from frostfs_testlib.utils.file_utils import generate_file +@pytest.mark.nightly @pytest.mark.s3_gate @pytest.mark.s3_gate_bucket class TestS3GateBucket: diff --git a/pytest_tests/testsuites/services/s3_gate/test_s3_locking.py b/pytest_tests/testsuites/services/s3_gate/test_s3_locking.py index bb054cb6..1e501209 100644 --- a/pytest_tests/testsuites/services/s3_gate/test_s3_locking.py +++ b/pytest_tests/testsuites/services/s3_gate/test_s3_locking.py @@ -22,14 +22,13 @@ def bucket_no_lock(s3_client: S3ClientWrapper): return s3_client.create_bucket(object_lock_enabled_for_bucket=False) +@pytest.mark.nightly @pytest.mark.s3_gate @pytest.mark.s3_gate_locking @pytest.mark.parametrize("version_id", [None, "second"]) class TestS3GateLocking: @allure.title("Retention period and legal lock on object (version_id={version_id}, s3_client={s3_client})") - def test_s3_object_locking( - self, s3_client: S3ClientWrapper, bucket_w_lock: str, version_id: str, simple_object_size: ObjectSize - ): + def test_s3_object_locking(self, s3_client: S3ClientWrapper, bucket_w_lock: str, version_id: str, simple_object_size: ObjectSize): file_path = generate_file(simple_object_size.value) file_name = s3_helper.object_key_from_file_path(file_path) retention_period = 2 @@ -73,9 +72,7 @@ class TestS3GateLocking: s3_client.delete_object(bucket_w_lock, file_name, version_id) @allure.title("Impossible to change retention mode COMPLIANCE (version_id={version_id}, s3_client={s3_client})") - def test_s3_mode_compliance( - self, s3_client: S3ClientWrapper, bucket_w_lock: str, version_id: str, simple_object_size: ObjectSize - ): + def test_s3_mode_compliance(self, s3_client: S3ClientWrapper, bucket_w_lock: str, version_id: str, simple_object_size: ObjectSize): file_path = generate_file(simple_object_size.value) file_name = s3_helper.object_key_from_file_path(file_path) retention_period = 2 @@ -105,9 +102,7 @@ class TestS3GateLocking: s3_client.put_object_retention(bucket_w_lock, file_name, retention, version_id) @allure.title("Change retention mode GOVERNANCE (version_id={version_id}, s3_client={s3_client})") - def test_s3_mode_governance( - self, s3_client: S3ClientWrapper, bucket_w_lock: str, version_id: str, simple_object_size: ObjectSize - ): + def test_s3_mode_governance(self, s3_client: S3ClientWrapper, bucket_w_lock: str, version_id: str, simple_object_size: ObjectSize): file_path = generate_file(simple_object_size.value) file_name = s3_helper.object_key_from_file_path(file_path) retention_period = 3 @@ -155,12 +150,8 @@ class TestS3GateLocking: s3_client.put_object_retention(bucket_w_lock, file_name, retention, version_id, True) s3_helper.assert_object_lock_mode(s3_client, bucket_w_lock, file_name, "GOVERNANCE", date_obj, "OFF") - @allure.title( - "[NEGATIVE] Lock object in bucket with disabled locking (version_id={version_id}, s3_client={s3_client})" - ) - def test_s3_legal_hold( - self, s3_client: S3ClientWrapper, bucket_no_lock: str, version_id: str, simple_object_size: ObjectSize - ): + @allure.title("[NEGATIVE] Lock object in bucket with disabled locking (version_id={version_id}, s3_client={s3_client})") + def test_s3_legal_hold(self, s3_client: S3ClientWrapper, bucket_no_lock: str, version_id: str, simple_object_size: ObjectSize): file_path = generate_file(simple_object_size.value) file_name = s3_helper.object_key_from_file_path(file_path) @@ -174,6 +165,7 @@ class TestS3GateLocking: s3_client.put_object_legal_hold(bucket_no_lock, file_name, "ON", version_id) +@pytest.mark.nightly @pytest.mark.s3_gate class TestS3GateLockingBucket: @allure.title("Bucket Lock (s3_client={s3_client})") diff --git a/pytest_tests/testsuites/services/s3_gate/test_s3_multipart.py b/pytest_tests/testsuites/services/s3_gate/test_s3_multipart.py index 8a8d3519..592f05de 100644 --- a/pytest_tests/testsuites/services/s3_gate/test_s3_multipart.py +++ b/pytest_tests/testsuites/services/s3_gate/test_s3_multipart.py @@ -14,6 +14,7 @@ from frostfs_testlib.utils.file_utils import generate_file, get_file_hash, split PART_SIZE = 5 * 1024 * 1024 +@pytest.mark.nightly @pytest.mark.s3_gate @pytest.mark.s3_gate_multipart class TestS3GateMultipart(ClusterTestBase): diff --git a/pytest_tests/testsuites/services/s3_gate/test_s3_object.py b/pytest_tests/testsuites/services/s3_gate/test_s3_object.py index 7b0f6e18..4b58eaa9 100644 --- a/pytest_tests/testsuites/services/s3_gate/test_s3_object.py +++ b/pytest_tests/testsuites/services/s3_gate/test_s3_object.py @@ -16,15 +16,10 @@ from frostfs_testlib.steps.s3 import s3_helper from frostfs_testlib.storage.dataclasses.object_size import ObjectSize from frostfs_testlib.testing.test_control import expect_not_raises from frostfs_testlib.utils import wallet_utils -from frostfs_testlib.utils.file_utils import ( - TestFile, - concat_files, - generate_file, - generate_file_with_content, - get_file_hash, -) +from frostfs_testlib.utils.file_utils import TestFile, concat_files, generate_file, generate_file_with_content, get_file_hash +@pytest.mark.nightly @pytest.mark.s3_gate @pytest.mark.s3_gate_object class TestS3GateObject: @@ -356,9 +351,7 @@ class TestS3GateObject: s3_helper.set_bucket_versioning(s3_client, bucket, VersioningStatus.ENABLED) with reporter.step("Put several versions of object into bucket"): version_id_1 = s3_client.put_object(bucket, file_name_simple) - file_name_1 = generate_file_with_content( - simple_object_size.value, file_path=file_name_simple, content=version_2_content - ) + file_name_1 = generate_file_with_content(simple_object_size.value, file_path=file_name_simple, content=version_2_content) version_id_2 = s3_client.put_object(bucket, file_name_1) with reporter.step("Get first version of object"): @@ -444,9 +437,7 @@ class TestS3GateObject: assert get_file_hash(con_file_1) == get_file_hash(file_name_1), "Hashes must be the same" with reporter.step("Get object"): - object_3_part_1 = s3_client.get_object( - bucket, file_name, object_range=[0, int(simple_object_size.value / 3)] - ) + object_3_part_1 = s3_client.get_object(bucket, file_name, object_range=[0, int(simple_object_size.value / 3)]) object_3_part_2 = s3_client.get_object( bucket, file_name, @@ -560,9 +551,7 @@ class TestS3GateObject: elif list_type == "v2": list_obj = s3_client.list_objects_v2(bucket) assert len(list_obj) == 2, "bucket should have 2 objects" - assert ( - list_obj.sort() == [file_name, file_name_2].sort() - ), f"bucket should have object key {file_name, file_name_2}" + assert list_obj.sort() == [file_name, file_name_2].sort(), f"bucket should have object key {file_name, file_name_2}" with reporter.step("Delete object"): delete_obj = s3_client.delete_object(bucket, file_name) @@ -695,13 +684,9 @@ class TestS3GateObject: with pytest.raises(Exception, match=S3_BUCKET_DOES_NOT_ALLOW_ACL): s3_client.put_object(bucket, file_path, grant_full_control=f"id={second_wallet_public_key}") - with reporter.step( - "[NEGATIVE] Put object with --grant-read uri=http://acs.amazonaws.com/groups/global/AllUsers" - ): + with reporter.step("[NEGATIVE] Put object with --grant-read uri=http://acs.amazonaws.com/groups/global/AllUsers"): with pytest.raises(Exception, match=S3_BUCKET_DOES_NOT_ALLOW_ACL): - s3_client.put_object( - bucket, file_path, grant_read="uri=http://acs.amazonaws.com/groups/global/AllUsers" - ) + s3_client.put_object(bucket, file_path, grant_read="uri=http://acs.amazonaws.com/groups/global/AllUsers") @allure.title("Put object with lock-mode (s3_client={s3_client})") def test_s3_put_object_lock_mode( @@ -727,9 +712,7 @@ class TestS3GateObject: ) s3_helper.assert_object_lock_mode(s3_client, bucket, file_name, "GOVERNANCE", date_obj, "OFF") - with reporter.step( - "Put new version of object with [--object-lock-mode COMPLIANCE] и [--object-lock-retain-until-date +3days]" - ): + with reporter.step("Put new version of object with [--object-lock-mode COMPLIANCE] и [--object-lock-retain-until-date +3days]"): date_obj = datetime.utcnow() + timedelta(days=2) generate_file_with_content(simple_object_size.value, file_path=file_path_1) s3_client.put_object( @@ -740,9 +723,7 @@ class TestS3GateObject: ) s3_helper.assert_object_lock_mode(s3_client, bucket, file_name, "COMPLIANCE", date_obj, "OFF") - with reporter.step( - "Put new version of object with [--object-lock-mode COMPLIANCE] и [--object-lock-retain-until-date +2days]" - ): + with reporter.step("Put new version of object with [--object-lock-mode COMPLIANCE] и [--object-lock-retain-until-date +2days]"): date_obj = datetime.utcnow() + timedelta(days=3) generate_file_with_content(simple_object_size.value, file_path=file_path_1) s3_client.put_object( @@ -809,9 +790,7 @@ class TestS3GateObject: with reporter.step(f"Check all objects put in bucket_{i} successfully"): bucket_objects = s3_client.list_objects_v2(bucket) - assert set(put_objects) == set( - bucket_objects - ), f"Expected all objects {put_objects} in objects list {bucket_objects}" + assert set(put_objects) == set(bucket_objects), f"Expected all objects {put_objects} in objects list {bucket_objects}" with reporter.step("Delete some objects from bucket_1 one by one"): objects_to_delete_b1 = random.sample(put_objects, k=max_delete_objects) @@ -871,9 +850,7 @@ class TestS3GateObject: with reporter.step("Check these are the same objects"): for obj_key in objects: got_object = s3_client.get_object(bucket, obj_key) - assert get_file_hash(got_object) == get_file_hash( - key_to_path.get(obj_key) - ), "Expected hashes are the same" + assert get_file_hash(got_object) == get_file_hash(key_to_path.get(obj_key)), "Expected hashes are the same" obj_head = s3_client.head_object(bucket, obj_key) assert obj_head.get("Metadata") == object_metadata, f"Metadata of object is {object_metadata}" object_grants = s3_client.get_object_acl(bucket, obj_key) @@ -890,11 +867,7 @@ class TestS3GateObject: with reporter.step("Put object"): test_file = generate_file(simple_object_size.value) - obj_key = ( - "/" - + "/".join(["".join(random.choices(key_characters_sample, k=5)) for _ in range(10)]) - + "/test_file_1" - ) + obj_key = "/" + "/".join(["".join(random.choices(key_characters_sample, k=5)) for _ in range(10)]) + "/test_file_1" s3_client.put_object(bucket, test_file, obj_key) with reporter.step("Check object can be downloaded"): diff --git a/pytest_tests/testsuites/services/s3_gate/test_s3_policy.py b/pytest_tests/testsuites/services/s3_gate/test_s3_policy.py index bedce602..3c6803bb 100644 --- a/pytest_tests/testsuites/services/s3_gate/test_s3_policy.py +++ b/pytest_tests/testsuites/services/s3_gate/test_s3_policy.py @@ -16,6 +16,7 @@ from frostfs_testlib.testing.test_control import expect_not_raises from frostfs_testlib.utils.file_utils import generate_file +@pytest.mark.nightly @pytest.mark.s3_gate @pytest.mark.parametrize("s3_policy", ["pytest_tests/resources/files/policy.json"], indirect=True) class TestS3GatePolicy(ClusterTestBase): @@ -38,9 +39,7 @@ class TestS3GatePolicy(ClusterTestBase): bucket_2 = s3_client.create_bucket(location_constraint="rep-3") s3_helper.set_bucket_versioning(s3_client, bucket_2, VersioningStatus.ENABLED) list_buckets = s3_client.list_buckets() - assert ( - bucket_1 in list_buckets and bucket_2 in list_buckets - ), f"Expected two buckets {bucket_1, bucket_2}, got {list_buckets}" + assert bucket_1 in list_buckets and bucket_2 in list_buckets, f"Expected two buckets {bucket_1, bucket_2}, got {list_buckets}" with reporter.step("Check head buckets"): with expect_not_raises(): diff --git a/pytest_tests/testsuites/services/s3_gate/test_s3_tagging.py b/pytest_tests/testsuites/services/s3_gate/test_s3_tagging.py index f36ed6e9..4bcd14ff 100644 --- a/pytest_tests/testsuites/services/s3_gate/test_s3_tagging.py +++ b/pytest_tests/testsuites/services/s3_gate/test_s3_tagging.py @@ -11,6 +11,7 @@ from frostfs_testlib.storage.dataclasses.object_size import ObjectSize from frostfs_testlib.utils.file_utils import generate_file +@pytest.mark.nightly @pytest.mark.s3_gate @pytest.mark.s3_gate_tagging class TestS3GateTagging: diff --git a/pytest_tests/testsuites/services/s3_gate/test_s3_versioning.py b/pytest_tests/testsuites/services/s3_gate/test_s3_versioning.py index 4047386f..2cf1cb60 100644 --- a/pytest_tests/testsuites/services/s3_gate/test_s3_versioning.py +++ b/pytest_tests/testsuites/services/s3_gate/test_s3_versioning.py @@ -9,6 +9,7 @@ from frostfs_testlib.storage.dataclasses.object_size import ObjectSize from frostfs_testlib.utils.file_utils import generate_file, generate_file_with_content, get_file_content +@pytest.mark.nightly @pytest.mark.s3_gate @pytest.mark.s3_gate_versioning class TestS3GateVersioning: @@ -77,9 +78,7 @@ class TestS3GateVersioning: file_name = s3_client.get_object(bucket, obj_key) got_content = get_file_content(file_name) - assert ( - got_content == version_2_content - ), f"Expected object content is\n{version_2_content}\nGot\n{got_content}" + assert got_content == version_2_content, f"Expected object content is\n{version_2_content}\nGot\n{got_content}" @allure.title("Enable and disable versioning without object_lock (s3_client={s3_client})") def test_s3_version(self, s3_client: S3ClientWrapper, simple_object_size: ObjectSize): @@ -97,9 +96,7 @@ class TestS3GateVersioning: actual_version = [version.get("VersionId") for version in object_version if version.get("Key") == file_name] assert actual_version == ["null"], f"Expected version is null in list-object-versions, got {object_version}" object_0 = s3_client.head_object(bucket, file_name) - assert ( - object_0.get("VersionId") == "null" - ), f"Expected version is null in head-object, got {object_0.get('VersionId')}" + assert object_0.get("VersionId") == "null", f"Expected version is null in head-object, got {object_0.get('VersionId')}" s3_helper.set_bucket_versioning(s3_client, bucket, VersioningStatus.ENABLED) diff --git a/pytest_tests/testsuites/session_token/test_object_session_token.py b/pytest_tests/testsuites/session_token/test_object_session_token.py index 7eaa43b8..805013fd 100644 --- a/pytest_tests/testsuites/session_token/test_object_session_token.py +++ b/pytest_tests/testsuites/session_token/test_object_session_token.py @@ -10,10 +10,10 @@ from frostfs_testlib.steps.session_token import create_session_token from frostfs_testlib.storage.dataclasses.object_size import ObjectSize from frostfs_testlib.storage.dataclasses.wallet import WalletInfo from frostfs_testlib.testing.cluster_test_base import ClusterTestBase -from frostfs_testlib.utils import wallet_utils from frostfs_testlib.utils.file_utils import generate_file +@pytest.mark.nightly @pytest.mark.sanity @pytest.mark.session_token class TestDynamicObjectSession(ClusterTestBase): diff --git a/pytest_tests/testsuites/session_token/test_static_object_session_token.py b/pytest_tests/testsuites/session_token/test_static_object_session_token.py index 466986e1..e51f0c8b 100644 --- a/pytest_tests/testsuites/session_token/test_static_object_session_token.py +++ b/pytest_tests/testsuites/session_token/test_static_object_session_token.py @@ -3,12 +3,7 @@ import logging import allure import pytest from frostfs_testlib import reporter -from frostfs_testlib.resources.error_patterns import ( - EXPIRED_SESSION_TOKEN, - MALFORMED_REQUEST, - OBJECT_ACCESS_DENIED, - OBJECT_NOT_FOUND, -) +from frostfs_testlib.resources.error_patterns import EXPIRED_SESSION_TOKEN, MALFORMED_REQUEST, OBJECT_ACCESS_DENIED, OBJECT_NOT_FOUND from frostfs_testlib.shell import Shell from frostfs_testlib.steps.cli.container import create_container from frostfs_testlib.steps.cli.object import ( @@ -138,6 +133,7 @@ def static_sessions( } +@pytest.mark.nightly @pytest.mark.static_session class TestObjectStaticSession(ClusterTestBase): @allure.title("Read operations with static session (method={method_under_test.__name__}, obj_size={object_size})") diff --git a/pytest_tests/testsuites/session_token/test_static_session_token_container.py b/pytest_tests/testsuites/session_token/test_static_session_token_container.py index 1694f623..a970fc13 100644 --- a/pytest_tests/testsuites/session_token/test_static_session_token_container.py +++ b/pytest_tests/testsuites/session_token/test_static_session_token_container.py @@ -8,6 +8,7 @@ from frostfs_testlib.storage.dataclasses.wallet import WalletInfo from frostfs_testlib.testing.cluster_test_base import ClusterTestBase +@pytest.mark.nightly @pytest.mark.static_session_container class TestSessionTokenContainer(ClusterTestBase): @pytest.fixture(scope="module") diff --git a/pytest_tests/testsuites/shard/test_control_shard.py b/pytest_tests/testsuites/shard/test_control_shard.py index 646151bc..c445279c 100644 --- a/pytest_tests/testsuites/shard/test_control_shard.py +++ b/pytest_tests/testsuites/shard/test_control_shard.py @@ -18,6 +18,7 @@ from frostfs_testlib.testing.cluster_test_base import ClusterTestBase from frostfs_testlib.utils.file_utils import generate_file +@pytest.mark.nightly @pytest.mark.shard class TestControlShard(ClusterTestBase): @staticmethod -- 2.45.3 From 04378b992cccb3d7b42caaac3ed36b418d4aedbe Mon Sep 17 00:00:00 2001 From: "a.berezin" Date: Tue, 29 Oct 2024 13:32:07 +0300 Subject: [PATCH 2/3] [#315] Use relpath for files Signed-off-by: a.berezin --- __init__.py | 3 ++ pytest_tests/helpers/container_access.py | 2 +- pytest_tests/resources/common.py | 3 ++ .../testsuites/access/acl/test_acl.py | 3 +- .../testsuites/access/ape/test_ape.py | 3 +- .../testsuites/access/ape/test_ape_filters.py | 9 +++--- .../testsuites/access/ape/test_bearer.py | 4 +-- pytest_tests/testsuites/conftest.py | 2 +- pytest_tests/testsuites/container/__init__.py | 0 .../testsuites/container/test_container.py | 2 +- .../testsuites/container/test_policy.py | 4 +-- pytest_tests/testsuites/failovers/__init__.py | 0 .../failovers/test_failover_storage.py | 32 +++++++------------ .../testsuites/management/__init__.py | 0 .../management/test_node_management.py | 2 +- pytest_tests/testsuites/object/__init__.py | 0 .../object/test_object_api_bearer.py | 4 +-- .../testsuites/object/test_object_lifetime.py | 2 +- .../testsuites/object/test_object_lock.py | 22 ++++--------- .../testsuites/replication/__init__.py | 0 .../replication/test_ec_replication.py | 6 ++-- pytest_tests/testsuites/services/__init__.py | 0 .../testsuites/services/http_gate/__init__.py | 0 .../services/http_gate/test_http_bearer.py | 2 +- .../services/http_gate/test_http_gate.py | 2 +- .../testsuites/services/s3_gate/__init__.py | 0 .../services/s3_gate/test_s3_policy.py | 6 ++-- 27 files changed, 50 insertions(+), 63 deletions(-) create mode 100644 __init__.py create mode 100644 pytest_tests/testsuites/container/__init__.py create mode 100644 pytest_tests/testsuites/failovers/__init__.py create mode 100644 pytest_tests/testsuites/management/__init__.py create mode 100644 pytest_tests/testsuites/object/__init__.py create mode 100644 pytest_tests/testsuites/replication/__init__.py create mode 100644 pytest_tests/testsuites/services/__init__.py create mode 100644 pytest_tests/testsuites/services/http_gate/__init__.py create mode 100644 pytest_tests/testsuites/services/s3_gate/__init__.py diff --git a/__init__.py b/__init__.py new file mode 100644 index 00000000..4a2630d8 --- /dev/null +++ b/__init__.py @@ -0,0 +1,3 @@ +import os + +TESTS_BASE_PATH = os.path.dirname(os.path.relpath(__file__)) diff --git a/pytest_tests/helpers/container_access.py b/pytest_tests/helpers/container_access.py index f19ab9b7..59194d5c 100644 --- a/pytest_tests/helpers/container_access.py +++ b/pytest_tests/helpers/container_access.py @@ -6,7 +6,7 @@ from frostfs_testlib.storage.cluster import Cluster from frostfs_testlib.storage.dataclasses import ape from frostfs_testlib.storage.dataclasses.wallet import WalletInfo -from pytest_tests.helpers.object_access import ( +from ..helpers.object_access import ( can_delete_object, can_get_head_object, can_get_object, diff --git a/pytest_tests/resources/common.py b/pytest_tests/resources/common.py index ebede363..38cef385 100644 --- a/pytest_tests/resources/common.py +++ b/pytest_tests/resources/common.py @@ -1,5 +1,8 @@ import os +from ... import TESTS_BASE_PATH + TEST_CYCLES_COUNT = int(os.getenv("TEST_CYCLES_COUNT", "1")) DEVENV_PATH = os.getenv("DEVENV_PATH", os.path.join("..", "frostfs-dev-env")) +S3_POLICY_FILE_LOCATION = os.path.join(TESTS_BASE_PATH, "pytest_tests/resources/files/policy.json") diff --git a/pytest_tests/testsuites/access/acl/test_acl.py b/pytest_tests/testsuites/access/acl/test_acl.py index a8d9ebb5..af64d0cf 100644 --- a/pytest_tests/testsuites/access/acl/test_acl.py +++ b/pytest_tests/testsuites/access/acl/test_acl.py @@ -8,8 +8,7 @@ from frostfs_testlib.storage.cluster import Cluster from frostfs_testlib.storage.dataclasses.wallet import WalletInfo from frostfs_testlib.testing.cluster_test_base import ClusterTestBase -from pytest_tests.helpers.container_access import assert_full_access_to_container, assert_no_access_to_container, assert_read_only_container - +from ....helpers.container_access import assert_full_access_to_container, assert_no_access_to_container, assert_read_only_container from ....helpers.container_spec import ContainerSpec diff --git a/pytest_tests/testsuites/access/ape/test_ape.py b/pytest_tests/testsuites/access/ape/test_ape.py index 56874075..f36d038e 100644 --- a/pytest_tests/testsuites/access/ape/test_ape.py +++ b/pytest_tests/testsuites/access/ape/test_ape.py @@ -12,13 +12,12 @@ from frostfs_testlib.utils import wallet_utils from frostfs_testlib.utils.failover_utils import wait_object_replication from frostfs_testlib.utils.file_utils import TestFile -from pytest_tests.helpers.container_access import ( +from ....helpers.container_access import ( ALL_OBJECT_OPERATIONS, assert_access_to_container, assert_full_access_to_container, assert_no_access_to_container, ) - from ....helpers.container_spec import ContainerSpec diff --git a/pytest_tests/testsuites/access/ape/test_ape_filters.py b/pytest_tests/testsuites/access/ape/test_ape_filters.py index b292a858..c82641fb 100644 --- a/pytest_tests/testsuites/access/ape/test_ape_filters.py +++ b/pytest_tests/testsuites/access/ape/test_ape_filters.py @@ -10,17 +10,18 @@ from frostfs_testlib.testing.cluster_test_base import ClusterTestBase from frostfs_testlib.testing.test_control import expect_not_raises from frostfs_testlib.utils.file_utils import TestFile -from pytest_tests.helpers.bearer_token import create_bearer_token -from pytest_tests.helpers.container_access import ( +from pytest_tests.helpers.object_access import OBJECT_NO_ACCESS + +from ....helpers.bearer_token import create_bearer_token +from ....helpers.container_access import ( ALL_OBJECT_OPERATIONS, FULL_ACCESS, assert_access_to_container, assert_full_access_to_container, assert_no_access_to_container, ) -from pytest_tests.helpers.object_access import OBJECT_NO_ACCESS - from ....helpers.container_spec import ContainerSpec +from ....helpers.object_access import OBJECT_ACCESS_DENIED @pytest.mark.nightly diff --git a/pytest_tests/testsuites/access/ape/test_bearer.py b/pytest_tests/testsuites/access/ape/test_bearer.py index 66045ebb..64a89ffd 100644 --- a/pytest_tests/testsuites/access/ape/test_bearer.py +++ b/pytest_tests/testsuites/access/ape/test_bearer.py @@ -7,8 +7,8 @@ from frostfs_testlib.storage.dataclasses.wallet import WalletInfo from frostfs_testlib.testing.cluster_test_base import ClusterTestBase from frostfs_testlib.utils.file_utils import TestFile -from pytest_tests.helpers.bearer_token import create_bearer_token -from pytest_tests.helpers.container_access import ( +from ....helpers.bearer_token import create_bearer_token +from ....helpers.container_access import ( ALL_OBJECT_OPERATIONS, assert_access_to_container, assert_full_access_to_container, diff --git a/pytest_tests/testsuites/conftest.py b/pytest_tests/testsuites/conftest.py index 9dedc53d..31900ff2 100644 --- a/pytest_tests/testsuites/conftest.py +++ b/pytest_tests/testsuites/conftest.py @@ -35,7 +35,7 @@ from frostfs_testlib.testing.test_control import run_optionally, wait_for_succes from frostfs_testlib.utils import env_utils, string_utils, version_utils from frostfs_testlib.utils.file_utils import TestFile, generate_file -from pytest_tests.resources.common import TEST_CYCLES_COUNT +from ..resources.common import TEST_CYCLES_COUNT logger = logging.getLogger("NeoLogger") diff --git a/pytest_tests/testsuites/container/__init__.py b/pytest_tests/testsuites/container/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/pytest_tests/testsuites/container/test_container.py b/pytest_tests/testsuites/container/test_container.py index d34a109e..ce1f760d 100644 --- a/pytest_tests/testsuites/container/test_container.py +++ b/pytest_tests/testsuites/container/test_container.py @@ -13,7 +13,7 @@ from frostfs_testlib.steps.cli.container import ( from frostfs_testlib.storage.dataclasses.wallet import WalletInfo from frostfs_testlib.testing.cluster_test_base import ClusterTestBase -from pytest_tests.helpers.utility import placement_policy_from_container +from ...helpers.utility import placement_policy_from_container @pytest.mark.nightly diff --git a/pytest_tests/testsuites/container/test_policy.py b/pytest_tests/testsuites/container/test_policy.py index 3def93c4..f0b9dd28 100644 --- a/pytest_tests/testsuites/container/test_policy.py +++ b/pytest_tests/testsuites/container/test_policy.py @@ -16,8 +16,8 @@ from frostfs_testlib.testing.test_control import wait_for_success from frostfs_testlib.utils.cli_utils import parse_netmap_output from frostfs_testlib.utils.file_utils import generate_file -from pytest_tests.helpers.utility import placement_policy_from_container -from pytest_tests.resources.policy_error_patterns import NOT_ENOUGH_TO_SELECT, NOT_FOUND_FILTER, NOT_FOUND_SELECTOR, NOT_PARSE_POLICY +from ...helpers.utility import placement_policy_from_container +from ...resources.policy_error_patterns import NOT_ENOUGH_TO_SELECT, NOT_FOUND_FILTER, NOT_FOUND_SELECTOR, NOT_PARSE_POLICY @pytest.mark.nightly diff --git a/pytest_tests/testsuites/failovers/__init__.py b/pytest_tests/testsuites/failovers/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/pytest_tests/testsuites/failovers/test_failover_storage.py b/pytest_tests/testsuites/failovers/test_failover_storage.py index 5f9eba51..f99333f8 100644 --- a/pytest_tests/testsuites/failovers/test_failover_storage.py +++ b/pytest_tests/testsuites/failovers/test_failover_storage.py @@ -34,6 +34,8 @@ from frostfs_testlib.utils.failover_utils import wait_object_replication from frostfs_testlib.utils.file_keeper import FileKeeper from frostfs_testlib.utils.file_utils import generate_file, get_file_hash +from ...resources.common import S3_POLICY_FILE_LOCATION + logger = logging.getLogger("NeoLogger") stopped_nodes: list[StorageNode] = [] @@ -95,9 +97,7 @@ class TestFailoverStorage(ClusterTestBase): ) with reporter.step("Check object data is not corrupted"): - got_file_path = get_object( - wallet, cid, oid, endpoint=replicated_nodes[0].get_rpc_endpoint(), shell=self.shell - ) + got_file_path = get_object(wallet, cid, oid, endpoint=replicated_nodes[0].get_rpc_endpoint(), shell=self.shell) assert get_file_hash(source_file_path) == get_file_hash(got_file_path) with reporter.step("Return all hosts"): @@ -105,12 +105,10 @@ class TestFailoverStorage(ClusterTestBase): with reporter.step("Check object data is not corrupted"): replicated_nodes = wait_object_replication(cid, oid, 2, shell=self.shell, nodes=self.cluster.storage_nodes) - got_file_path = get_object( - wallet, cid, oid, shell=self.shell, endpoint=replicated_nodes[0].get_rpc_endpoint() - ) + got_file_path = get_object(wallet, cid, oid, shell=self.shell, endpoint=replicated_nodes[0].get_rpc_endpoint()) assert get_file_hash(source_file_path) == get_file_hash(got_file_path) - @pytest.mark.parametrize("s3_policy", ["pytest_tests/resources/files/policy.json"], indirect=True) + @pytest.mark.parametrize("s3_policy", [S3_POLICY_FILE_LOCATION], indirect=True) @allure.title("Do not ignore unhealthy tree endpoints (s3_client={s3_client})") def test_unhealthy_tree( self, @@ -151,7 +149,7 @@ class TestFailoverStorage(ClusterTestBase): wallet=default_wallet, shell=self.shell, endpoint=self.cluster.storage_nodes[0].get_rpc_endpoint(), - bucket_container_resolver=bucket_container_resolver + bucket_container_resolver=bucket_container_resolver, )[0] with reporter.step("Turn off all storage nodes except bucket node"): @@ -282,9 +280,7 @@ class TestEmptyMap(ClusterTestBase): cluster_state_controller.stop_services_of_type(StorageNode) with reporter.step("Remove all nodes from network map"): - remove_nodes_from_map_morph( - shell=self.shell, cluster=self.cluster, remove_nodes=self.cluster.services(StorageNode) - ) + remove_nodes_from_map_morph(shell=self.shell, cluster=self.cluster, remove_nodes=self.cluster.services(StorageNode)) with reporter.step("Return all storage nodes to network map"): self.return_nodes_after_stop_with_check_empty_map(cluster_state_controller) @@ -465,9 +461,7 @@ class TestStorageDataLoss(ClusterTestBase): s3_client.put_object(bucket, complex_object_path) with reporter.step("Check objects are in bucket"): - s3_helper.check_objects_in_bucket( - s3_client, bucket, expected_objects=[simple_object_key, complex_object_key] - ) + s3_helper.check_objects_in_bucket(s3_client, bucket, expected_objects=[simple_object_key, complex_object_key]) with reporter.step("Stop storage services on all nodes"): cluster_state_controller.stop_services_of_type(StorageNode) @@ -581,17 +575,13 @@ class TestStorageDataLoss(ClusterTestBase): exception_messages.append(f"Shard {shard} changed status to {status}") with reporter.step("No related errors should be in log"): - if node_under_test.host.is_message_in_logs( - message_regex=r"\Wno such file or directory\W", since=test_start_time - ): + if node_under_test.host.is_message_in_logs(message_regex=r"\Wno such file or directory\W", since=test_start_time): exception_messages.append(f"Node {node_under_test} have shard errors in logs") with reporter.step("Pass test if no errors found"): assert not exception_messages, "\n".join(exception_messages) - @allure.title( - "Loss of one node should trigger use of tree and storage service in another node (s3_client={s3_client})" - ) + @allure.title("Loss of one node should trigger use of tree and storage service in another node (s3_client={s3_client})") def test_s3_one_endpoint_loss( self, bucket, @@ -613,7 +603,7 @@ class TestStorageDataLoss(ClusterTestBase): put_object = s3_client.put_object(bucket, file_path) s3_helper.check_objects_in_bucket(s3_client, bucket, expected_objects=[file_name]) - @pytest.mark.parametrize("s3_policy", ["pytest_tests/resources/files/policy.json"], indirect=True) + @pytest.mark.parametrize("s3_policy", [S3_POLICY_FILE_LOCATION], indirect=True) @allure.title("After Pilorama.db loss on one node object is retrievable (s3_client={s3_client})") def test_s3_one_pilorama_loss( self, diff --git a/pytest_tests/testsuites/management/__init__.py b/pytest_tests/testsuites/management/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/pytest_tests/testsuites/management/test_node_management.py b/pytest_tests/testsuites/management/test_node_management.py index a6854862..0948f609 100644 --- a/pytest_tests/testsuites/management/test_node_management.py +++ b/pytest_tests/testsuites/management/test_node_management.py @@ -44,7 +44,7 @@ from frostfs_testlib.utils import string_utils from frostfs_testlib.utils.failover_utils import wait_object_replication from frostfs_testlib.utils.file_utils import generate_file -from pytest_tests.helpers.utility import wait_for_gc_pass_on_storage_nodes +from ...helpers.utility import wait_for_gc_pass_on_storage_nodes logger = logging.getLogger("NeoLogger") check_nodes: list[StorageNode] = [] diff --git a/pytest_tests/testsuites/object/__init__.py b/pytest_tests/testsuites/object/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/pytest_tests/testsuites/object/test_object_api_bearer.py b/pytest_tests/testsuites/object/test_object_api_bearer.py index 694dcefc..f6f9d404 100644 --- a/pytest_tests/testsuites/object/test_object_api_bearer.py +++ b/pytest_tests/testsuites/object/test_object_api_bearer.py @@ -21,8 +21,8 @@ from frostfs_testlib.testing.cluster_test_base import ClusterTestBase from frostfs_testlib.testing.test_control import expect_not_raises from pytest import FixtureRequest -from pytest_tests.helpers.bearer_token import create_bearer_token -from pytest_tests.helpers.container_access import assert_full_access_to_container +from ...helpers.bearer_token import create_bearer_token +from ...helpers.container_access import assert_full_access_to_container @pytest.fixture(scope="session") diff --git a/pytest_tests/testsuites/object/test_object_lifetime.py b/pytest_tests/testsuites/object/test_object_lifetime.py index ce4d40ad..7e326e89 100644 --- a/pytest_tests/testsuites/object/test_object_lifetime.py +++ b/pytest_tests/testsuites/object/test_object_lifetime.py @@ -12,7 +12,7 @@ from frostfs_testlib.storage.dataclasses.wallet import WalletInfo from frostfs_testlib.testing.cluster_test_base import ClusterTestBase from frostfs_testlib.utils.file_utils import generate_file, get_file_hash -from pytest_tests.helpers.utility import wait_for_gc_pass_on_storage_nodes +from ...helpers.utility import wait_for_gc_pass_on_storage_nodes logger = logging.getLogger("NeoLogger") diff --git a/pytest_tests/testsuites/object/test_object_lock.py b/pytest_tests/testsuites/object/test_object_lock.py index ef602184..358cdc4b 100755 --- a/pytest_tests/testsuites/object/test_object_lock.py +++ b/pytest_tests/testsuites/object/test_object_lock.py @@ -32,7 +32,7 @@ from frostfs_testlib.testing.cluster_test_base import ClusterTestBase from frostfs_testlib.testing.test_control import expect_not_raises, wait_for_success from frostfs_testlib.utils import datetime_utils -from pytest_tests.helpers.utility import wait_for_gc_pass_on_storage_nodes +from ...helpers.utility import wait_for_gc_pass_on_storage_nodes logger = logging.getLogger("NeoLogger") @@ -67,9 +67,7 @@ def locked_storage_object( current_epoch = ensure_fresh_epoch(client_shell, cluster) expiration_epoch = current_epoch + FIXTURE_LOCK_LIFETIME - storage_object = user_container.generate_object( - object_size.value, expire_at=current_epoch + FIXTURE_OBJECT_LIFETIME - ) + storage_object = user_container.generate_object(object_size.value, expire_at=current_epoch + FIXTURE_OBJECT_LIFETIME) lock_object_id = lock_object( storage_object.wallet, storage_object.cid, @@ -78,9 +76,7 @@ def locked_storage_object( cluster.default_rpc_endpoint, lifetime=FIXTURE_LOCK_LIFETIME, ) - storage_object.locks = [ - LockObjectInfo(storage_object.cid, lock_object_id, FIXTURE_LOCK_LIFETIME, expiration_epoch) - ] + storage_object.locks = [LockObjectInfo(storage_object.cid, lock_object_id, FIXTURE_LOCK_LIFETIME, expiration_epoch)] yield storage_object @@ -143,9 +139,7 @@ class TestObjectLockWithGrpc(ClusterTestBase): with reporter.step("Creating locked object"): current_epoch = self.get_epoch() - storage_object = user_container.generate_object( - object_size.value, expire_at=current_epoch + FIXTURE_OBJECT_LIFETIME - ) + storage_object = user_container.generate_object(object_size.value, expire_at=current_epoch + FIXTURE_OBJECT_LIFETIME) lock_object( storage_object.wallet, storage_object.cid, @@ -221,9 +215,7 @@ class TestObjectLockWithGrpc(ClusterTestBase): 1, ) - @allure.title( - "Lock must contain valid lifetime or expire_at field: (lifetime={wrong_lifetime}, expire-at={wrong_expire_at})" - ) + @allure.title("Lock must contain valid lifetime or expire_at field: (lifetime={wrong_lifetime}, expire-at={wrong_expire_at})") # We operate with only lock object here so no complex object needed in this test @pytest.mark.parametrize("object_size", ["simple"], indirect=True) @pytest.mark.parametrize( @@ -676,9 +668,7 @@ class TestObjectLockWithGrpc(ClusterTestBase): with reporter.step("Generate two objects"): for epoch_i in range(2): - storage_objects.append( - user_container.generate_object(object_size.value, expire_at=current_epoch + epoch_i + 3) - ) + storage_objects.append(user_container.generate_object(object_size.value, expire_at=current_epoch + epoch_i + 3)) self.tick_epoch() diff --git a/pytest_tests/testsuites/replication/__init__.py b/pytest_tests/testsuites/replication/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/pytest_tests/testsuites/replication/test_ec_replication.py b/pytest_tests/testsuites/replication/test_ec_replication.py index 8e243a8d..4c7424d7 100644 --- a/pytest_tests/testsuites/replication/test_ec_replication.py +++ b/pytest_tests/testsuites/replication/test_ec_replication.py @@ -22,6 +22,8 @@ from frostfs_testlib.testing.test_control import wait_for_success from frostfs_testlib.utils import datetime_utils from frostfs_testlib.utils.file_utils import generate_file, get_file_hash +from ...resources.common import S3_POLICY_FILE_LOCATION + def pytest_generate_tests(metafunc: pytest.Metafunc) -> None: if "ec_policy" not in metafunc.fixturenames: @@ -677,7 +679,7 @@ class TestECReplication(ClusterTestBase): ) @allure.title("Create bucket with EC policy (s3_client={s3_client})") - @pytest.mark.parametrize("s3_policy, s3_client", [("pytest_tests/resources/files/policy.json", AwsCliClient)], indirect=True) + @pytest.mark.parametrize("s3_policy, s3_client", [(S3_POLICY_FILE_LOCATION, AwsCliClient)], indirect=True) def test_create_bucket_with_ec_location( self, s3_client: S3ClientWrapper, bucket_container_resolver: BucketContainerResolver, grpc_client: GrpcClientWrapper ) -> None: @@ -692,7 +694,7 @@ class TestECReplication(ClusterTestBase): assert container @allure.title("Bucket object count chunks (s3_client={s3_client}, size={object_size})") - @pytest.mark.parametrize("s3_policy, s3_client", [("pytest_tests/resources/files/policy.json", AwsCliClient)], indirect=True) + @pytest.mark.parametrize("s3_policy, s3_client", [(S3_POLICY_FILE_LOCATION, AwsCliClient)], indirect=True) def test_count_chunks_bucket_with_ec_location( self, s3_client: S3ClientWrapper, diff --git a/pytest_tests/testsuites/services/__init__.py b/pytest_tests/testsuites/services/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/pytest_tests/testsuites/services/http_gate/__init__.py b/pytest_tests/testsuites/services/http_gate/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/pytest_tests/testsuites/services/http_gate/test_http_bearer.py b/pytest_tests/testsuites/services/http_gate/test_http_bearer.py index 7d5db791..4e200229 100644 --- a/pytest_tests/testsuites/services/http_gate/test_http_bearer.py +++ b/pytest_tests/testsuites/services/http_gate/test_http_bearer.py @@ -15,7 +15,7 @@ from frostfs_testlib.storage.dataclasses.wallet import WalletInfo from frostfs_testlib.testing.cluster_test_base import ClusterTestBase from frostfs_testlib.utils.file_utils import generate_file -from pytest_tests.helpers.bearer_token import create_bearer_token +from ....helpers.bearer_token import create_bearer_token logger = logging.getLogger("NeoLogger") diff --git a/pytest_tests/testsuites/services/http_gate/test_http_gate.py b/pytest_tests/testsuites/services/http_gate/test_http_gate.py index 1bd736dd..0561f5a8 100644 --- a/pytest_tests/testsuites/services/http_gate/test_http_gate.py +++ b/pytest_tests/testsuites/services/http_gate/test_http_gate.py @@ -20,7 +20,7 @@ from frostfs_testlib.storage.dataclasses.object_size import ObjectSize from frostfs_testlib.testing.cluster_test_base import ClusterTestBase from frostfs_testlib.utils.file_utils import generate_file, get_file_hash -from pytest_tests.helpers.utility import wait_for_gc_pass_on_storage_nodes +from ....helpers.utility import wait_for_gc_pass_on_storage_nodes OBJECT_NOT_FOUND_ERROR = "not found" diff --git a/pytest_tests/testsuites/services/s3_gate/__init__.py b/pytest_tests/testsuites/services/s3_gate/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/pytest_tests/testsuites/services/s3_gate/test_s3_policy.py b/pytest_tests/testsuites/services/s3_gate/test_s3_policy.py index 3c6803bb..d5334173 100644 --- a/pytest_tests/testsuites/services/s3_gate/test_s3_policy.py +++ b/pytest_tests/testsuites/services/s3_gate/test_s3_policy.py @@ -1,5 +1,4 @@ import json -import os import allure import pytest @@ -15,10 +14,12 @@ from frostfs_testlib.testing.cluster_test_base import ClusterTestBase from frostfs_testlib.testing.test_control import expect_not_raises from frostfs_testlib.utils.file_utils import generate_file +from ....resources.common import S3_POLICY_FILE_LOCATION + @pytest.mark.nightly @pytest.mark.s3_gate -@pytest.mark.parametrize("s3_policy", ["pytest_tests/resources/files/policy.json"], indirect=True) +@pytest.mark.parametrize("s3_policy", [S3_POLICY_FILE_LOCATION], indirect=True) class TestS3GatePolicy(ClusterTestBase): @allure.title("Bucket creation with retention policy applied (s3_client={s3_client})") def test_s3_bucket_location( @@ -100,7 +101,6 @@ class TestS3GatePolicy(ClusterTestBase): s3_client.get_bucket_policy(bucket) with reporter.step("Put new policy"): - custom_policy = f"file://{os.getcwd()}/pytest_tests/resources/files/bucket_policy.json" custom_policy = { "Version": "2012-10-17", "Id": "aaaa-bbbb-cccc-dddd", -- 2.45.3 From 1825aeebbf3f5c5ec26932616f7ed2f1b4501400 Mon Sep 17 00:00:00 2001 From: "a.berezin" Date: Wed, 30 Oct 2024 14:19:26 +0300 Subject: [PATCH 3/3] [#316] Move variable under package for single repo runs Signed-off-by: a.berezin --- __init__.py | 3 --- pytest_tests/__init__.py | 3 +++ pytest_tests/resources/common.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/__init__.py b/__init__.py index 4a2630d8..e69de29b 100644 --- a/__init__.py +++ b/__init__.py @@ -1,3 +0,0 @@ -import os - -TESTS_BASE_PATH = os.path.dirname(os.path.relpath(__file__)) diff --git a/pytest_tests/__init__.py b/pytest_tests/__init__.py index e69de29b..4a2630d8 100644 --- a/pytest_tests/__init__.py +++ b/pytest_tests/__init__.py @@ -0,0 +1,3 @@ +import os + +TESTS_BASE_PATH = os.path.dirname(os.path.relpath(__file__)) diff --git a/pytest_tests/resources/common.py b/pytest_tests/resources/common.py index 38cef385..83e8e837 100644 --- a/pytest_tests/resources/common.py +++ b/pytest_tests/resources/common.py @@ -1,8 +1,8 @@ import os -from ... import TESTS_BASE_PATH +from .. import TESTS_BASE_PATH TEST_CYCLES_COUNT = int(os.getenv("TEST_CYCLES_COUNT", "1")) DEVENV_PATH = os.getenv("DEVENV_PATH", os.path.join("..", "frostfs-dev-env")) -S3_POLICY_FILE_LOCATION = os.path.join(TESTS_BASE_PATH, "pytest_tests/resources/files/policy.json") +S3_POLICY_FILE_LOCATION = os.path.join(TESTS_BASE_PATH, "resources/files/policy.json") -- 2.45.3