From b64656f0b31a612f47b2549cd3baab2a14aa0f2f Mon Sep 17 00:00:00 2001
From: Yulia Kovshova <y.kovshova@yadro.com>
Date: Mon, 17 Oct 2022 14:41:20 +0300
Subject: [PATCH] Don't check ACL in sync test

Signed-off-by: Yulia Kovshova <y.kovshova@yadro.com>
---
 .../testsuites/services/s3_gate/test_s3_bucket.py | 15 +++------------
 .../testsuites/services/s3_gate/test_s3_object.py | 12 ++++++------
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/pytest_tests/testsuites/services/s3_gate/test_s3_bucket.py b/pytest_tests/testsuites/services/s3_gate/test_s3_bucket.py
index 55a428ad..2db93367 100644
--- a/pytest_tests/testsuites/services/s3_gate/test_s3_bucket.py
+++ b/pytest_tests/testsuites/services/s3_gate/test_s3_bucket.py
@@ -3,7 +3,7 @@ from datetime import datetime, timedelta
 import allure
 import pytest
 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.s3_gate_base import TestS3GateBase
@@ -131,18 +131,9 @@ class TestS3GateBucket(TestS3GateBase):
                 ObjectLockRetainUntilDate=date_obj_1.strftime("%Y-%m-%dT%H:%M:%S"),
                 ObjectLockLegalHoldStatus="ON",
             )
-            object_1 = s3_gate_object.get_object_s3(
-                self.s3_client, bucket_1, file_name, full_output=True
+            assert_object_lock_mode(
+                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")
     def test_s3_delete_bucket(self):
diff --git a/pytest_tests/testsuites/services/s3_gate/test_s3_object.py b/pytest_tests/testsuites/services/s3_gate/test_s3_object.py
index a217a382..b3d3f614 100644
--- a/pytest_tests/testsuites/services/s3_gate/test_s3_object.py
+++ b/pytest_tests/testsuites/services/s3_gate/test_s3_object.py
@@ -896,9 +896,9 @@ class TestS3GateObject(TestS3GateBase):
                 assert (
                     obj_head.get("Metadata") == 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_permission = [permission.get("Permission") for permission in obj_acl]
-                assert obj_permission == [
-                    "FULL_CONTROL",
-                    "FULL_CONTROL",
-                ], "Permission for all groups is FULL_CONTROL"
+                # 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]
+                # assert obj_permission == [
+                #     "FULL_CONTROL",
+                #     "FULL_CONTROL",
+                # ], "Permission for all groups is FULL_CONTROL"