Skip to content

Commit 65b315b

Browse files
committed
Tag multipart tests
1 parent d245097 commit 65b315b

File tree

3 files changed

+53
-0
lines changed

3 files changed

+53
-0
lines changed

pytest.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ markers =
2828
lifecycle_expiration
2929
lifecycle_transition
3030
list_objects_v2
31+
multipart
3132
object_lock
3233
role_policy
3334
session_policy

s3tests/functional/test_s3.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,7 @@ def test_object_storage_class():
397397
@pytest.mark.storage_class
398398
@pytest.mark.fails_on_aws
399399
@pytest.mark.fails_on_dbstore
400+
@pytest.mark.multipart
400401
def test_object_storage_class_multipart():
401402
sc = configured_storage_classes()
402403
if len(sc) < 2:
@@ -443,6 +444,7 @@ def test_object_modify_storage_class():
443444
@pytest.mark.storage_class
444445
@pytest.mark.fails_on_aws
445446
@pytest.mark.fails_on_dbstore
447+
@pytest.mark.multipart
446448
def test_object_modify_storage_class_multipart():
447449
_do_test_object_modify_storage_class(_populate_multipart_key, size=11*1024*1024)
448450

@@ -476,6 +478,7 @@ def test_object_storage_class_copy():
476478
@pytest.mark.storage_class
477479
@pytest.mark.fails_on_aws
478480
@pytest.mark.fails_on_dbstore
481+
@pytest.mark.multipart
479482
def test_object_storage_class_copy_multipart():
480483
_do_test_object_storage_class_copy(_populate_multipart_key, size=9*1024*1024)
481484

@@ -625,6 +628,7 @@ def _multipart_upload_enc(bucket, s3_key_name, size, part_size=5*1024*1024,
625628

626629
@pytest.mark.encryption
627630
@pytest.mark.fails_on_dbstore
631+
@pytest.mark.multipart
628632
def test_encryption_sse_c_multipart_invalid_chunks_1():
629633
bucket = get_new_bucket()
630634
key = "multipart_enc"
@@ -649,6 +653,7 @@ def test_encryption_sse_c_multipart_invalid_chunks_1():
649653

650654
@pytest.mark.encryption
651655
@pytest.mark.fails_on_dbstore
656+
@pytest.mark.multipart
652657
def test_encryption_sse_c_multipart_invalid_chunks_2():
653658
bucket = get_new_bucket()
654659
key = "multipart_enc"

0 commit comments

Comments
 (0)