From 9eac53965a051768e38dba0dc66d1d36ef9abf91 Mon Sep 17 00:00:00 2001 From: "a.berezin" Date: Tue, 16 Apr 2024 13:22:49 +0300 Subject: [PATCH] [#215] Disable EC for v0.39 Signed-off-by: a.berezin --- pytest_tests/testsuites/conftest.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pytest_tests/testsuites/conftest.py b/pytest_tests/testsuites/conftest.py index 279024bb..319e4e2b 100644 --- a/pytest_tests/testsuites/conftest.py +++ b/pytest_tests/testsuites/conftest.py @@ -23,7 +23,7 @@ from frostfs_testlib.resources.common import ( ) from frostfs_testlib.s3 import AwsCliClient, Boto3ClientWrapper, S3ClientWrapper, VersioningStatus from frostfs_testlib.shell import LocalShell, Shell -from frostfs_testlib.steps.cli.container import DEFAULT_PLACEMENT_RULE, DEFAULT_EC_PLACEMENT_RULE +from frostfs_testlib.steps.cli.container import DEFAULT_EC_PLACEMENT_RULE, DEFAULT_PLACEMENT_RULE from frostfs_testlib.steps.cli.object import get_netmap_netinfo from frostfs_testlib.steps.s3 import s3_helper from frostfs_testlib.storage import get_service_registry @@ -210,6 +210,7 @@ def object_size( return complex_object_size + @pytest.fixture(scope="session") def rep_placement_policy() -> PlacementPolicy: return PlacementPolicy("rep", DEFAULT_PLACEMENT_RULE) @@ -222,10 +223,7 @@ def ec_placement_policy() -> PlacementPolicy: # By default we want all tests to be executed with both storage policies. # This can be overriden in choosen tests if needed. -@pytest.fixture( - scope="session", - params=[pytest.param("rep", marks=pytest.mark.rep), pytest.param("ec", marks=pytest.mark.ec)], -) +@pytest.fixture(scope="session", params=[pytest.param("rep", marks=pytest.mark.rep)]) def placement_policy( rep_placement_policy: PlacementPolicy, ec_placement_policy: PlacementPolicy, request: pytest.FixtureRequest ) -> PlacementPolicy: @@ -234,6 +232,7 @@ def placement_policy( return ec_placement_policy + @pytest.fixture(scope="session") def cluster(temp_directory: str, hosting: Hosting, client_shell: Shell) -> Cluster: cluster = Cluster(hosting) -- 2.45.2