Skip to content

Commit

Permalink
Update s3 eacl assertions due to neofs-s3-gw#976
Browse files Browse the repository at this point in the history 
closes #72

Signed-off-by: Evgeniy Zayats <[email protected]>
  • Loading branch information
Evgeniy Zayats committed Aug 19, 2024
1 parent fff40f2 commit f31dbc0
Showing 1 changed file with 19 additions and 19 deletions.
38 changes: 19 additions & 19 deletions s3tests_boto3/functional/test_s3.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4732,15 +4732,15 @@ def test_bucket_acl_default():
user_id = get_main_user_id()

assert response["Owner"]["DisplayName"] == display_name
assert response["Owner"]["ID"] == user_id
assert response["Owner"]["ID"] == display_name

grants = response["Grants"]
check_grants(
grants,
[
dict(
Permission="FULL_CONTROL",
ID=user_id,
ID=display_name,
DisplayName=display_name,
URI=None,
EmailAddress=None,
Expand Down Expand Up @@ -4774,7 +4774,7 @@ def test_bucket_acl_canned_during_create():
),
dict(
Permission="FULL_CONTROL",
ID=user_id,
ID=display_name,
DisplayName=display_name,
URI=None,
EmailAddress=None,
Expand Down Expand Up @@ -4807,7 +4807,7 @@ def test_bucket_acl_canned():
),
dict(
Permission="FULL_CONTROL",
ID=user_id,
ID=display_name,
DisplayName=display_name,
URI=None,
EmailAddress=None,
Expand All @@ -4825,7 +4825,7 @@ def test_bucket_acl_canned():
[
dict(
Permission="FULL_CONTROL",
ID=user_id,
ID=display_name,
DisplayName=display_name,
URI=None,
EmailAddress=None,
Expand Down Expand Up @@ -4865,7 +4865,7 @@ def test_bucket_acl_canned_publicreadwrite():
),
dict(
Permission="FULL_CONTROL",
ID=user_id,
ID=display_name,
DisplayName=display_name,
URI=None,
EmailAddress=None,
Expand Down Expand Up @@ -4899,7 +4899,7 @@ def test_bucket_acl_canned_authenticatedread():
),
dict(
Permission="FULL_CONTROL",
ID=user_id,
ID=display_name,
DisplayName=display_name,
URI=None,
EmailAddress=None,
Expand All @@ -4925,7 +4925,7 @@ def test_object_acl_default():
[
dict(
Permission="FULL_CONTROL",
ID=user_id,
ID=display_name,
DisplayName=display_name,
URI=None,
EmailAddress=None,
Expand Down Expand Up @@ -4959,7 +4959,7 @@ def test_object_acl_canned_during_create():
),
dict(
Permission="FULL_CONTROL",
ID=user_id,
ID=display_name,
DisplayName=display_name,
URI=None,
EmailAddress=None,
Expand Down Expand Up @@ -4994,7 +4994,7 @@ def test_object_acl_canned():
),
dict(
Permission="FULL_CONTROL",
ID=user_id,
ID=display_name,
DisplayName=display_name,
URI=None,
EmailAddress=None,
Expand All @@ -5013,7 +5013,7 @@ def test_object_acl_canned():
[
dict(
Permission="FULL_CONTROL",
ID=user_id,
ID=display_name,
DisplayName=display_name,
URI=None,
EmailAddress=None,
Expand Down Expand Up @@ -5057,7 +5057,7 @@ def test_object_acl_canned_publicreadwrite():
),
dict(
Permission="FULL_CONTROL",
ID=user_id,
ID=display_name,
DisplayName=display_name,
URI=None,
EmailAddress=None,
Expand Down Expand Up @@ -5094,7 +5094,7 @@ def test_object_acl_canned_authenticatedread():
),
dict(
Permission="FULL_CONTROL",
ID=user_id,
ID=display_name,
DisplayName=display_name,
URI=None,
EmailAddress=None,
Expand Down Expand Up @@ -9548,13 +9548,13 @@ def test_versioned_object_acl():
user_id = get_main_user_id()

assert response["Owner"]["DisplayName"] == display_name
assert response["Owner"]["ID"] == user_id
assert response["Owner"]["ID"] == display_name

grants = response["Grants"]
default_policy = [
dict(
Permission="FULL_CONTROL",
ID=user_id,
ID=display_name,
DisplayName=display_name,
URI=None,
EmailAddress=None,
Expand Down Expand Up @@ -9583,7 +9583,7 @@ def test_versioned_object_acl():
),
dict(
Permission="FULL_CONTROL",
ID=user_id,
ID=display_name,
DisplayName=display_name,
URI=None,
EmailAddress=None,
Expand Down Expand Up @@ -9622,13 +9622,13 @@ def test_versioned_object_acl_no_version_specified():
user_id = get_main_user_id()

assert response["Owner"]["DisplayName"] == display_name
assert response["Owner"]["ID"] == user_id
assert response["Owner"]["ID"] == display_name

grants = response["Grants"]
default_policy = [
dict(
Permission="FULL_CONTROL",
ID=user_id,
ID=display_name,
DisplayName=display_name,
URI=None,
EmailAddress=None,
Expand All @@ -9655,7 +9655,7 @@ def test_versioned_object_acl_no_version_specified():
),
dict(
Permission="FULL_CONTROL",
ID=user_id,
ID=display_name,
DisplayName=display_name,
URI=None,
EmailAddress=None,
Expand Down

0 comments on commit f31dbc0

Please sign in to comment.