s3: update ACL tests expectations

Signed-off-by: Evgeniy Zayats <[email protected]>

Author: Evgeniy Zayats

dynamic_env_pytest_tests/tests/services/s3_gate/test_s3_ACL.py

@@ -30,7 +30,7 @@ def test_s3_object_ACL(self, bucket, simple_object_size):
             acl = "public-read"
             s3_gate_object.put_object_acl_s3(self.s3_client, bucket, file_name, acl)
             obj_acl = s3_gate_object.get_object_acl_s3(self.s3_client, bucket, file_name)
-            assert_object_s3_acl(acl_grants=obj_acl, permitted_users="AllUsers", acl=acl)
+            assert_object_s3_acl(acl_grants=obj_acl, permitted_users="AllUsers", acl="public-read-write")
 
         with allure.step("Put object ACL = private"):
             acl = "private"
@@ -48,7 +48,7 @@ def test_s3_object_ACL(self, bucket, simple_object_size):
                 grant_read="uri=http://acs.amazonaws.com/groups/global/AllUsers",
             )
             obj_acl = s3_gate_object.get_object_acl_s3(self.s3_client, bucket, file_name)
-            assert_object_s3_acl(acl_grants=obj_acl, permitted_users="AllUsers", acl="grant-read")
+            assert_object_s3_acl(acl_grants=obj_acl, permitted_users="AllUsers", acl="public-read-write")
 
     @allure.title("Test S3: Bucket ACL")
     def test_s3_bucket_ACL(self):
@@ -76,5 +76,5 @@ def test_s3_bucket_ACL(self):
             )
             bucket_acl = s3_gate_bucket.get_bucket_acl(self.s3_client, bucket)
             assert_bucket_s3_acl(
-                acl_grants=bucket_acl, permitted_users="AllUsers", acl="grant-write"
+                acl_grants=bucket_acl, permitted_users="AllUsers", acl="public-read-write"
             )

dynamic_env_pytest_tests/tests/services/s3_gate/test_s3_bucket.py

@@ -38,7 +38,7 @@ def test_s3_create_bucket_with_ACL(self):
             bucket_1 = s3_gate_bucket.create_bucket_s3(self.s3_client, object_lock_enabled_for_bucket=True, acl=acl, bucket_configuration="rep-1")
             bucket_acl_1 = s3_gate_bucket.get_bucket_acl(self.s3_client, bucket_1)
             assert_bucket_s3_acl(
-                acl_grants=bucket_acl_1, permitted_users="AllUsers", acl=acl
+                acl_grants=bucket_acl_1, permitted_users="AllUsers", acl="public-read-write"
             )
 
         with allure.step("Create bucket with ACL = public-read-write"):
@@ -58,7 +58,7 @@ def test_s3_create_bucket_with_ACL(self):
             )
             bucket_acl_3 = s3_gate_bucket.get_bucket_acl(self.s3_client, bucket_3)
             assert_bucket_s3_acl(
-                acl_grants=bucket_acl_3, permitted_users="AllUsers", acl=acl
+                acl_grants=bucket_acl_3, permitted_users="AllUsers", acl="public-read-write"
             )
 
     @pytest.mark.acl
@@ -74,7 +74,7 @@ def test_s3_create_bucket_with_grands(self):
             )
             bucket_acl = s3_gate_bucket.get_bucket_acl(self.s3_client, bucket)
             assert_bucket_s3_acl(
-                acl_grants=bucket_acl, permitted_users="AllUsers", acl="grant-read"
+                acl_grants=bucket_acl, permitted_users="AllUsers", acl="public-read-write"
             )
 
         with allure.step("Create bucket with --grant-write"):
@@ -86,7 +86,7 @@ def test_s3_create_bucket_with_grands(self):
             )
             bucket_acl_1 = s3_gate_bucket.get_bucket_acl(self.s3_client, bucket_1)
             assert_bucket_s3_acl(
-                acl_grants=bucket_acl_1, permitted_users="AllUsers", acl="grant-write"
+                acl_grants=bucket_acl_1, permitted_users="AllUsers", acl="public-read-write"
             )
 
         with allure.step("Create bucket with --grant-full-control"):

dynamic_env_pytest_tests/tests/services/s3_gate/test_s3_object.py

@@ -699,7 +699,7 @@ def test_s3_put_object_acl(
             file_path_2 = generate_file_with_content(simple_object_size, file_path=file_path_1)
             s3_gate_object.put_object_s3(self.s3_client, bucket, file_path_2, ACL=acl)
             obj_acl = s3_gate_object.get_object_acl_s3(self.s3_client, bucket, file_name)
-            assert_object_s3_acl(acl_grants=obj_acl, permitted_users="AllUsers", acl=acl)
+            assert_object_s3_acl(acl_grants=obj_acl, permitted_users="AllUsers", acl="public-read-write")
             object_2 = s3_gate_object.get_object_s3(self.s3_client, bucket, file_name)
             assert get_file_hash(file_path_2) == get_file_hash(object_2), "Hashes must be the same"
 
@@ -717,7 +717,7 @@ def test_s3_put_object_acl(
             file_path_4 = generate_file_with_content(simple_object_size, file_path=file_path_1)
             s3_gate_object.put_object_s3(self.s3_client, bucket, file_path_4, ACL=acl)
             obj_acl = s3_gate_object.get_object_acl_s3(self.s3_client, bucket, file_name)
-            assert_object_s3_acl(acl_grants=obj_acl, permitted_users="AllUsers", acl=acl)
+            assert_object_s3_acl(acl_grants=obj_acl, permitted_users="AllUsers", acl="public-read-write")
             object_4 = s3_gate_object.get_object_s3(self.s3_client, bucket, file_name)
             assert get_file_hash(file_path_4) == get_file_hash(object_4), "Hashes must be the same"