From 598fd3777d950de68349c8bca862f8392e8403e0 Mon Sep 17 00:00:00 2001 From: Jiffin Tony Thottan Date: Mon, 24 Feb 2025 11:11:43 +0530 Subject: [PATCH] running cloud restore tests seperately Signed-off-by: Jiffin Tony Thottan --- s3tests.conf.SAMPLE | 2 +- s3tests_boto3/functional/__init__.py | 2 +- s3tests_boto3/functional/test_s3.py | 6 ------ 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/s3tests.conf.SAMPLE b/s3tests.conf.SAMPLE index 643597e..1489a72 100644 --- a/s3tests.conf.SAMPLE +++ b/s3tests.conf.SAMPLE @@ -73,7 +73,7 @@ access_key = NOPQRSTUVWXYZABCDEFG secret_key = nopqrstuvwxyzabcdefghijklmnabcdefghijklm #[s3 cloud] -## to run the testcases with "cloud_transition" for transition +## to run the testcases with "cloud_transition" for transition ## and "cloud_restore" for restore attribute. ## Note: the waiting time may have to tweaked depending on ## the I/O latency to the cloud endpoint. diff --git a/s3tests_boto3/functional/__init__.py b/s3tests_boto3/functional/__init__.py index 43292b1..3f975a3 100644 --- a/s3tests_boto3/functional/__init__.py +++ b/s3tests_boto3/functional/__init__.py @@ -399,7 +399,7 @@ def get_cloud_config(cfg): config.cloud_regular_storage_class = cfg.get('s3 cloud', "storage_class") except (configparser.NoSectionError, configparser.NoOptionError): config.cloud_regular_storage_class = None - + try: config.read_through_restore_days = int(cfg.get('s3 cloud', "read_through_restore_days")) except (configparser.NoSectionError, configparser.NoOptionError): diff --git a/s3tests_boto3/functional/test_s3.py b/s3tests_boto3/functional/test_s3.py index 39ca4c5..0267900 100644 --- a/s3tests_boto3/functional/test_s3.py +++ b/s3tests_boto3/functional/test_s3.py @@ -9739,8 +9739,6 @@ def test_lifecycle_cloud_transition_large_obj(): expire1_key1_str = prefix + keys[1] verify_object(cloud_client, target_path, expire1_key1_str, data, target_sc) -@pytest.mark.lifecycle_transition -@pytest.mark.cloud_transition @pytest.mark.cloud_restore @pytest.mark.fails_on_aws @pytest.mark.fails_on_dbstore @@ -9784,8 +9782,6 @@ def test_restore_object_temporary(): response = client.head_object(Bucket=bucket, Key=key) assert response['ContentLength'] == 0 -@pytest.mark.lifecycle_transition -@pytest.mark.cloud_transition @pytest.mark.cloud_restore @pytest.mark.fails_on_aws @pytest.mark.fails_on_dbstore @@ -9822,8 +9818,6 @@ def test_restore_object_permanent(): response = client.head_object(Bucket=bucket, Key=key) assert response['ContentLength'] == len(data) -@pytest.mark.lifecycle_transition -@pytest.mark.cloud_transition @pytest.mark.cloud_restore @pytest.mark.fails_on_aws @pytest.mark.fails_on_dbstore