From 79a60c5e5bad701155266b079dd97604638ab11b Mon Sep 17 00:00:00 2001 From: Andrey Berezin Date: Fri, 23 Jun 2023 17:50:18 +0300 Subject: [PATCH] Temp disable curl upload for complex objects Signed-off-by: Andrey Berezin --- .../testsuites/services/http_gate/test_http_bearer.py | 2 ++ .../testsuites/services/http_gate/test_http_gate.py | 2 ++ .../testsuites/services/http_gate/test_http_headers.py | 7 +++++-- .../services/http_gate/test_http_streaming.py | 1 + .../services/http_gate/test_http_system_header.py | 10 ++++++++-- 5 files changed, 18 insertions(+), 4 deletions(-) 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 b31327f..561e65f 100644 --- a/pytest_tests/testsuites/services/http_gate/test_http_bearer.py +++ b/pytest_tests/testsuites/services/http_gate/test_http_bearer.py @@ -20,6 +20,7 @@ from frostfs_testlib.utils.file_utils import generate_file logger = logging.getLogger("NeoLogger") +@pytest.mark.skip("Temporarly skip for v0.37") @pytest.mark.sanity @pytest.mark.http_gate class Test_http_bearer(ClusterTestBase): @@ -91,6 +92,7 @@ class Test_http_bearer(ClusterTestBase): error_pattern="access to object operation denied", ) + @pytest.mark.skip("Temp disable for v0.37") @pytest.mark.parametrize( "object_size", [pytest.lazy_fixture("simple_object_size"), pytest.lazy_fixture("complex_object_size")], 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 d7f48ec..90aa437 100644 --- a/pytest_tests/testsuites/services/http_gate/test_http_gate.py +++ b/pytest_tests/testsuites/services/http_gate/test_http_gate.py @@ -285,6 +285,7 @@ class TestHttpGate(ClusterTestBase): assert get_file_hash(f"{dir_path}/file2") == get_file_hash(file_path_large) @pytest.mark.long + @pytest.mark.skip("Temp disable for v0.37") @allure.title("Test Put over HTTP/Curl, Get over HTTP/Curl for large object") def test_put_http_get_http_large_file(self, complex_object_size: int): """ @@ -332,6 +333,7 @@ class TestHttpGate(ClusterTestBase): object_getter=get_via_http_curl, ) + @pytest.mark.skip("Temp disable for v0.37") @allure.title("Test Put/Get over HTTP using Curl utility") def test_put_http_get_http_curl(self, complex_object_size: int, simple_object_size: int): """ diff --git a/pytest_tests/testsuites/services/http_gate/test_http_headers.py b/pytest_tests/testsuites/services/http_gate/test_http_headers.py index f25995a..496d9b7 100644 --- a/pytest_tests/testsuites/services/http_gate/test_http_headers.py +++ b/pytest_tests/testsuites/services/http_gate/test_http_headers.py @@ -47,9 +47,12 @@ class Test_http_headers(ClusterTestBase): @pytest.fixture( params=[ pytest.lazy_fixture("simple_object_size"), - pytest.lazy_fixture("complex_object_size"), + # TODO: Temp disable for v0.37 + # pytest.lazy_fixture("complex_object_size"), ], - ids=["simple object", "complex object"], + # TODO: Temp disable for v0.37 + # ids=["simple object", "complex object"], + ids=["simple object"], scope="class", ) def storage_objects_with_attributes(self, request: FixtureRequest) -> list[StorageObjectInfo]: diff --git a/pytest_tests/testsuites/services/http_gate/test_http_streaming.py b/pytest_tests/testsuites/services/http_gate/test_http_streaming.py index 359e420..2c0db7c 100644 --- a/pytest_tests/testsuites/services/http_gate/test_http_streaming.py +++ b/pytest_tests/testsuites/services/http_gate/test_http_streaming.py @@ -27,6 +27,7 @@ class Test_http_streaming(ClusterTestBase): [pytest.lazy_fixture("complex_object_size")], ids=["complex object"], ) + @pytest.mark.skip("Temp disable for v0.37") def test_object_can_be_put_get_by_streaming(self, object_size: int): """ Test that object can be put using gRPC interface and get using HTTP. diff --git a/pytest_tests/testsuites/services/http_gate/test_http_system_header.py b/pytest_tests/testsuites/services/http_gate/test_http_system_header.py index 14d7ca6..bb3e3ae 100644 --- a/pytest_tests/testsuites/services/http_gate/test_http_system_header.py +++ b/pytest_tests/testsuites/services/http_gate/test_http_system_header.py @@ -209,6 +209,7 @@ class Test_http_system_header(ClusterTestBase): [pytest.lazy_fixture("simple_object_size"), pytest.lazy_fixture("complex_object_size")], ids=["simple object", "complex object"], ) + @pytest.mark.skip("Temp disable for v0.37") def test_http_attr_priority_epoch_duration( self, user_container: str, object_size: int, epoch_duration: int ): @@ -256,6 +257,7 @@ class Test_http_system_header(ClusterTestBase): [pytest.lazy_fixture("simple_object_size"), pytest.lazy_fixture("complex_object_size")], ids=["simple object", "complex object"], ) + @pytest.mark.skip("Temp disable for v0.37") def test_http_attr_priority_dur_timestamp( self, user_container: str, object_size: int, epoch_duration: int ): @@ -310,6 +312,7 @@ class Test_http_system_header(ClusterTestBase): [pytest.lazy_fixture("simple_object_size"), pytest.lazy_fixture("complex_object_size")], ids=["simple object", "complex object"], ) + @pytest.mark.skip("Temp disable for v0.37") def test_http_attr_priority_timestamp_rfc( self, user_container: str, object_size: int, epoch_duration: int ): @@ -359,8 +362,11 @@ class Test_http_system_header(ClusterTestBase): @allure.title("Test that object is automatically delete when expiration passed") @pytest.mark.parametrize( "object_size", - [pytest.lazy_fixture("simple_object_size"), pytest.lazy_fixture("complex_object_size")], - ids=["simple object", "complex object"], + # TODO: Temp disabled for v0.37 + # [pytest.lazy_fixture("simple_object_size"), pytest.lazy_fixture("complex_object_size")], + [pytest.lazy_fixture("simple_object_size")], + # ids=["simple object", "complex object"], + ids=["simple object"], ) def test_http_rfc_object_unavailable_after_expir( self, user_container: str, object_size: int, epoch_duration: int