ylukoyan/frostfs-testcases
1
0
Fork 0
forked from TrueCloudLab/frostfs-testcases
Code Pull requests Activity

Don't check ACL in sync test

Browse source 
Signed-off-by: Yulia Kovshova <y.kovshova@yadro.com>
This commit is contained in:
Юлия Ковшова 2022-10-17 14:41:20 +03:00 committed by Julia Kovshova
parent 8e8a5b6efd
commit b64656f0b3
2 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pytest_tests/testsuites/services/s3_gate/test_s3_bucket.py
View file

@ -3,7 +3,7 @@ from datetime import datetime, timedelta
import allure import allure
import pytest import pytest
from file_helper import generate_file from file_helper import generate_file
from s3_helper import check_objects_in_bucket, object_key_from_file_path from s3_helper import assert_object_lock_mode, check_objects_in_bucket, object_key_from_file_path
from steps import s3_gate_bucket, s3_gate_object from steps import s3_gate_bucket, s3_gate_object
from steps.s3_gate_base import TestS3GateBase from steps.s3_gate_base import TestS3GateBase
@ -131,18 +131,9 @@ class TestS3GateBucket(TestS3GateBase):
ObjectLockRetainUntilDate=date_obj_1.strftime("%Y-%m-%dT%H:%M:%S"), ObjectLockRetainUntilDate=date_obj_1.strftime("%Y-%m-%dT%H:%M:%S"),
ObjectLockLegalHoldStatus="ON", ObjectLockLegalHoldStatus="ON",
) )
object_1 = s3_gate_object.get_object_s3( assert_object_lock_mode(
self.s3_client, bucket_1, file_name, full_output=True self.s3_client, bucket, file_name, "COMPLIANCE", date_obj_1, "ON"
) )
assert (
object_1.get("ObjectLockMode") == "COMPLIANCE"
), "Expected Object Lock Mode is COMPLIANCE"
assert str(date_obj_1.strftime("%Y-%m-%dT%H:%M:%S")) in object_1.get(
"ObjectLockRetainUntilDate"
), f'Expected Object Lock Retain Until Date is {str(date_obj_1.strftime("%Y-%m-%dT%H:%M:%S"))}'
assert (
object_1.get("ObjectLockLegalHoldStatus") == "ON"
), "Expected Object Lock Legal Hold Status is ON"
@allure.title("Test S3: delete bucket") @allure.title("Test S3: delete bucket")
def test_s3_delete_bucket(self): def test_s3_delete_bucket(self):

12
pytest_tests/testsuites/services/s3_gate/test_s3_object.py
View file

@ -896,9 +896,9 @@ class TestS3GateObject(TestS3GateBase):
assert ( assert (
obj_head.get("Metadata") == object_metadata obj_head.get("Metadata") == object_metadata
), f"Metadata of object is {object_metadata}" ), f"Metadata of object is {object_metadata}"
obj_acl = s3_gate_object.get_object_acl_s3(self.s3_client, bucket, obj_key) # obj_acl = s3_gate_object.get_object_acl_s3(self.s3_client, bucket, obj_key)
obj_permission = [permission.get("Permission") for permission in obj_acl] # obj_permission = [permission.get("Permission") for permission in obj_acl]
assert obj_permission == [ # assert obj_permission == [
"FULL_CONTROL", # "FULL_CONTROL",
"FULL_CONTROL", # "FULL_CONTROL",
], "Permission for all groups is FULL_CONTROL" # ], "Permission for all groups is FULL_CONTROL"