Skip to content

Commit

Permalink
s3: enable large object tests (#783)
Browse files Browse the repository at this point in the history
  • Loading branch information
roman-khimov authored Apr 19, 2024
2 parents 234941b + 778f51f commit 812b098
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 11 deletions.
4 changes: 0 additions & 4 deletions pytest_tests/tests/services/s3_gate/test_s3_gate.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ def test_s3_buckets(self, simple_object_size):
s3_gate_bucket.head_bucket(self.s3_client, bucket_1)

@allure.title("Test S3 Object API")
@pytest.mark.skip(reason="https://github.com/nspcc-dev/neofs-node/issues/2729")
@pytest.mark.parametrize(
"file_type", ["simple", "large"], ids=["Simple object", "Large object"]
)
Expand Down Expand Up @@ -356,7 +355,6 @@ def test_s3_api_object_tagging(self, bucket, simple_object_size):
check_tags_by_object(self.s3_client, bucket, obj_key, [])

@allure.title("Test S3: Delete object & delete objects S3 API")
@pytest.mark.skip(reason="https://github.com/nspcc-dev/neofs-node/issues/2729")
def test_s3_api_delete(self, two_buckets, simple_object_size, complex_object_size):
"""
Check DeleteObject and DeleteObjects S3 API operations. From first bucket some objects deleted one by one.
Expand Down Expand Up @@ -413,7 +411,6 @@ def test_s3_api_delete(self, two_buckets, simple_object_size, complex_object_siz
try_to_get_objects_and_expect_error(self.s3_client, bucket_2, objects_to_delete_b2)

@allure.title("Test S3: Copy object to the same bucket")
@pytest.mark.skip(reason="https://github.com/nspcc-dev/neofs-node/issues/2729")
def test_s3_copy_same_bucket(self, bucket, complex_object_size, simple_object_size):
"""
Test object can be copied to the same bucket.
Expand Down Expand Up @@ -458,7 +455,6 @@ def test_s3_copy_same_bucket(self, bucket, complex_object_size, simple_object_si
)

@allure.title("Test S3: Copy object to another bucket")
@pytest.mark.skip(reason="https://github.com/nspcc-dev/neofs-node/issues/2729")
def test_s3_copy_to_another_bucket(self, two_buckets, complex_object_size, simple_object_size):
"""
Test object can be copied to another bucket.
Expand Down
7 changes: 0 additions & 7 deletions pytest_tests/tests/services/s3_gate/test_s3_object.py
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,6 @@ def test_s3_copy_tagging(self, bucket, simple_object_size):
assert tag in got_tags, f"Expected tag {tag} in {got_tags}"

@allure.title("Test S3: Delete version of object")
@pytest.mark.skip(reason="https://github.com/nspcc-dev/neofs-node/issues/2729")
def test_s3_delete_versioning(self, bucket, complex_object_size, simple_object_size):
version_1_content = "Version 1"
version_2_content = "Version 2"
Expand Down Expand Up @@ -396,7 +395,6 @@ def test_s3_get_versioning(self, bucket, simple_object_size):

@pytest.mark.skip("Requires further investigation. S3 gate returns 500 on this test")
@allure.title("Test S3: Get range")
@pytest.mark.skip(reason="https://github.com/nspcc-dev/neofs-node/issues/2729")
def test_s3_get_range(self, bucket, complex_object_size: int, simple_object_size: int):
file_path = generate_file(complex_object_size)
file_name = self.object_key_from_file_path(file_path)
Expand Down Expand Up @@ -480,7 +478,6 @@ def test_s3_get_range(self, bucket, complex_object_size: int, simple_object_size

@allure.title("Test S3: Copy object with metadata")
@pytest.mark.smoke
@pytest.mark.skip(reason="https://github.com/nspcc-dev/neofs-node/issues/2729")
def test_s3_head_object(self, bucket, complex_object_size, simple_object_size):
object_metadata = {f"{uuid.uuid4()}": f"{uuid.uuid4()}"}
file_path = generate_file(complex_object_size)
Expand Down Expand Up @@ -520,7 +517,6 @@ def test_s3_head_object(self, bucket, complex_object_size, simple_object_size):

@allure.title("Test S3: list of object with versions")
@pytest.mark.parametrize("list_type", ["v1", "v2"])
@pytest.mark.skip(reason="https://github.com/nspcc-dev/neofs-node/issues/2729")
def test_s3_list_object(self, list_type: str, bucket, complex_object_size):
file_path_1 = generate_file(complex_object_size)
file_name = self.object_key_from_file_path(file_path_1)
Expand Down Expand Up @@ -558,7 +554,6 @@ def test_s3_list_object(self, list_type: str, bucket, complex_object_size):
assert "DeleteMarker" in delete_obj.keys(), f"Expected delete Marker"

@allure.title("Test S3: put object")
@pytest.mark.skip(reason="https://github.com/nspcc-dev/neofs-node/issues/2729")
def test_s3_put_object(self, bucket, complex_object_size, simple_object_size):
file_path_1 = generate_file(complex_object_size)
file_name = self.object_key_from_file_path(file_path_1)
Expand Down Expand Up @@ -680,7 +675,6 @@ def prepare_two_wallets(self, default_wallet, client_shell):
self.other_public_key = get_wallet_public_key(self.other_wallet.path, WALLET_PASS)

@allure.title("Test S3: put object with ACL")
@pytest.mark.skip(reason="https://github.com/nspcc-dev/neofs-node/issues/2729")
@pytest.mark.parametrize("bucket_versioning", ["ENABLED", "SUSPENDED"])
def test_s3_put_object_acl(
self,
Expand Down Expand Up @@ -765,7 +759,6 @@ def test_s3_put_object_acl(
assert get_file_hash(file_path_7) == get_file_hash(object_7), "Hashes must be the same"

@allure.title("Test S3: put object with lock-mode")
@pytest.mark.skip(reason="https://github.com/nspcc-dev/neofs-node/issues/2729")
def test_s3_put_object_lock_mode(self, complex_object_size, simple_object_size):
file_path_1 = generate_file(complex_object_size)
file_name = self.object_key_from_file_path(file_path_1)
Expand Down

0 comments on commit 812b098

Please sign in to comment.