From 3b071f02f798bbf8e37a8f2b5ea8f36eab484462 Mon Sep 17 00:00:00 2001 From: Andrey Berezin Date: Mon, 27 Nov 2023 13:47:02 +0300 Subject: [PATCH] [#157] Updates for skipped tests Signed-off-by: Andrey Berezin --- .../testsuites/services/http_gate/test_http_bearer.py | 3 +-- pytest_tests/testsuites/services/http_gate/test_http_gate.py | 4 +--- .../testsuites/services/http_gate/test_http_headers.py | 2 +- .../testsuites/services/http_gate/test_http_streaming.py | 2 +- .../testsuites/services/http_gate/test_http_system_header.py | 5 +---- pytest_tests/testsuites/services/s3_gate/test_s3_gate.py | 4 +--- pytest_tests/testsuites/services/s3_gate/test_s3_object.py | 4 +--- 7 files changed, 7 insertions(+), 17 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 bcaef26..92d996a 100644 --- a/pytest_tests/testsuites/services/http_gate/test_http_bearer.py +++ b/pytest_tests/testsuites/services/http_gate/test_http_bearer.py @@ -21,8 +21,8 @@ from frostfs_testlib.utils.file_utils import generate_file logger = logging.getLogger("NeoLogger") +@pytest.mark.skip("Skipped temporarly") @pytest.mark.http_gate -@pytest.mark.skip("Skipped due to deprecated PUT via http") @pytest.mark.http_put class Test_http_bearer(ClusterTestBase): PLACEMENT_RULE = "REP 2 IN X CBF 1 SELECT 2 FROM * AS X" @@ -88,7 +88,6 @@ class Test_http_bearer(ClusterTestBase): error_pattern="access to object operation denied", ) - @pytest.mark.skip("Temp disable for v0.37") def test_put_with_bearer_when_eacl_restrict( self, object_size: ObjectSize, 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 fc5b4f3..eea454e 100644 --- a/pytest_tests/testsuites/services/http_gate/test_http_gate.py +++ b/pytest_tests/testsuites/services/http_gate/test_http_gate.py @@ -104,9 +104,9 @@ class TestHttpGate(ClusterTestBase): ) @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.skip("Skipped temporarly") @pytest.mark.http_gate @pytest.mark.http_put -@pytest.mark.skip("Skipped due to deprecated PUT via http") class TestHttpPut(ClusterTestBase): @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") @@ -159,7 +159,6 @@ class TestHttpPut(ClusterTestBase): "https://git.frostfs.info/TrueCloudLab/frostfs-http-gw#by-attributes", name="download by attributes", ) - @pytest.mark.skip("Skipped due to deprecated PUT via http") @allure.title("Put over HTTP, Get over HTTP with {id} header") @pytest.mark.parametrize( "attributes,id", @@ -362,7 +361,6 @@ class TestHttpPut(ClusterTestBase): object_getter=get_via_http_curl, ) - @pytest.mark.skip("Skipped due to deprecated PUT via http") @allure.title("Put/Get over HTTP using Curl utility") def test_put_http_get_http_curl(self, complex_object_size: ObjectSize, simple_object_size: ObjectSize): """ 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 be99e78..074097c 100644 --- a/pytest_tests/testsuites/services/http_gate/test_http_headers.py +++ b/pytest_tests/testsuites/services/http_gate/test_http_headers.py @@ -27,9 +27,9 @@ OBJECT_ALREADY_REMOVED_ERROR = "object already removed" logger = logging.getLogger("NeoLogger") +@pytest.mark.skip("Skipped temporarly") @pytest.mark.http_gate @pytest.mark.http_put -@pytest.mark.skip("Skipped due to deprecated PUT via http") class Test_http_headers(ClusterTestBase): PLACEMENT_RULE = "REP 2 IN X CBF 1 SELECT 4 FROM * AS X" obj1_keys = ["Writer", "Chapter1", "Chapter2"] 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 3d6cb81..2275db3 100644 --- a/pytest_tests/testsuites/services/http_gate/test_http_streaming.py +++ b/pytest_tests/testsuites/services/http_gate/test_http_streaming.py @@ -12,9 +12,9 @@ from frostfs_testlib.utils.file_utils import generate_file logger = logging.getLogger("NeoLogger") +@pytest.mark.skip("Skipped temporarly") @pytest.mark.http_gate @pytest.mark.http_put -@pytest.mark.skip("Skipped due to deprecated PUT via http") class Test_http_streaming(ClusterTestBase): PLACEMENT_RULE = "REP 2 IN X CBF 1 SELECT 4 FROM * AS X" 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 e3248ee..5567a33 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 @@ -31,9 +31,9 @@ SYSTEM_EXPIRATION_TIMESTAMP = "System-Expiration-Timestamp" SYSTEM_EXPIRATION_RFC3339 = "System-Expiration-RFC3339" +@pytest.mark.skip("Skipped temporarly") @pytest.mark.http_gate @pytest.mark.http_put -@pytest.mark.skip("Skipped due to deprecated PUT via http") class Test_http_system_header(ClusterTestBase): PLACEMENT_RULE = "REP 2 IN X CBF 1 SELECT 2 FROM * AS X" @@ -191,7 +191,6 @@ class Test_http_system_header(ClusterTestBase): ) @allure.title("Priority of attributes epoch>duration (obj_size={object_size})") - @pytest.mark.skip("Temp disable for v0.37") def test_http_attr_priority_epoch_duration(self, user_container: str, object_size: ObjectSize, epoch_duration: int): self.tick_epoch() epoch_count = 1 @@ -229,7 +228,6 @@ class Test_http_system_header(ClusterTestBase): get_object_from_random_node(self.wallet, user_container, oid, self.shell, self.cluster) @allure.title("Priority of attributes duration>timestamp (obj_size={object_size})") - @pytest.mark.skip("Temp disable for v0.37") def test_http_attr_priority_dur_timestamp(self, user_container: str, object_size: ObjectSize, epoch_duration: int): self.tick_epoch() epoch_count = 2 @@ -270,7 +268,6 @@ class Test_http_system_header(ClusterTestBase): get_object_from_random_node(self.wallet, user_container, oid, self.shell, self.cluster) @allure.title("Priority of attributes timestamp>Expiration-RFC (obj_size={object_size})") - @pytest.mark.skip("Temp disable for v0.37") def test_http_attr_priority_timestamp_rfc(self, user_container: str, object_size: ObjectSize, epoch_duration: int): self.tick_epoch() epoch_count = 2 diff --git a/pytest_tests/testsuites/services/s3_gate/test_s3_gate.py b/pytest_tests/testsuites/services/s3_gate/test_s3_gate.py index c1254da..a9a49d4 100644 --- a/pytest_tests/testsuites/services/s3_gate/test_s3_gate.py +++ b/pytest_tests/testsuites/services/s3_gate/test_s3_gate.py @@ -134,6 +134,7 @@ class TestS3Gate: s3_client.get_object_attributes(bucket, file_name, attrs) @allure.title("Sync directory (s3_client={s3_client})") + @pytest.mark.parametrize("s3_client", [AwsCliClient], indirect=True) def test_s3_sync_dir(self, s3_client: S3ClientWrapper, bucket: str, simple_object_size: ObjectSize): """ Test checks sync directory with AWS CLI utility. @@ -142,9 +143,6 @@ class TestS3Gate: file_path_2 = os.path.join(os.getcwd(), ASSETS_DIR, "test_sync", "test_file_2") key_to_path = {"test_file_1": file_path_1, "test_file_2": file_path_2} - if not isinstance(s3_client, AwsCliClient): - pytest.skip("This test is not supported with boto3 client") - generate_file_with_content(simple_object_size.value, file_path=file_path_1) generate_file_with_content(simple_object_size.value, file_path=file_path_2) 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 d250915..f876ad7 100644 --- a/pytest_tests/testsuites/services/s3_gate/test_s3_object.py +++ b/pytest_tests/testsuites/services/s3_gate/test_s3_object.py @@ -777,6 +777,7 @@ class TestS3GateObject: ) @allure.title("Sync directory (sync_type={sync_type}, s3_client={s3_client})") + @pytest.mark.parametrize("s3_client", [AwsCliClient], indirect=True) @pytest.mark.parametrize("sync_type", ["sync", "cp"]) def test_s3_sync_dir( self, @@ -790,9 +791,6 @@ class TestS3GateObject: object_metadata = {f"{uuid.uuid4()}": f"{uuid.uuid4()}"} key_to_path = {"test_file_1": file_path_1, "test_file_2": file_path_2} - if not isinstance(s3_client, AwsCliClient): - pytest.skip("This test is not supported with boto3 client") - generate_file_with_content(simple_object_size.value, file_path=file_path_1) generate_file_with_content(simple_object_size.value, file_path=file_path_2) s3_helper.set_bucket_versioning(s3_client, bucket, VersioningStatus.ENABLED)