running cloud restore tests seperately

Signed-off-by: Jiffin Tony Thottan <thottanjiffin@gmail.com>

diff --git a/s3tests.conf.SAMPLE b/s3tests.conf.SAMPLE
index 643597ea2b0638eb48603743f333fad16fb4736d..1489a721be524bcd8c2f77b9fa4ae6c657f88a4b 100644 (file)
--- 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 43292b1283d1c6400d147ec3cca27feb0d73721a..3f975a3d4b654e1ea48f300757f3ae814de0b8bc 100644 (file)
--- 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 39ca4c55e6c411e616da1475fbcf69f2d904f7e7..026790078ef9c830188d916eacc4baefcc57cc37 100644 (file)
--- 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