dkirillov/s3-tests
1
0
Fork 0
forked from TrueCloudLab/s3-tests
Code Pull requests Activity

Improving check_grants reliability

Browse source 
Signed-off-by: Pragadeeswaran Sathyanarayanan <psathyan@redhat.com>
(cherry picked from commit 5f96a32045)
This commit is contained in:
Pragadeeswaran Sathyanarayanan 2021-12-28 20:56:23 +05:30 committed by Ali Maredia
parent b31649f351
commit 0f4f722f25
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
s3tests_boto3/functional/test_s3.py
View file

@ -4446,12 +4446,19 @@ def check_access_denied(fn, *args, **kwargs):
status = _get_status(e.response) status = _get_status(e.response)
eq(status, 403) eq(status, 403)
def check_grants(got, want): def check_grants(got, want):
""" """
Check that grants list in got matches the dictionaries in want, Check that grants list in got matches the dictionaries in want,
in any order. in any order.
""" """
eq(len(got), len(want)) eq(len(got), len(want))
# There are instances when got does not match due the order of item.
if got[0]["Grantee"].get("DisplayName"):
got.sort(key=lambda x: x["Grantee"].get("DisplayName"))
want.sort(key=lambda x: x["DisplayName"])
for g, w in zip(got, want): for g, w in zip(got, want):
w = dict(w) w = dict(w)
g = dict(g) g = dict(g)
@ -4463,6 +4470,7 @@ def check_grants(got, want):
eq(g['Grantee'].pop('EmailAddress', None), w['EmailAddress']) eq(g['Grantee'].pop('EmailAddress', None), w['EmailAddress'])
eq(g, {'Grantee': {}}) eq(g, {'Grantee': {}})
@attr(resource='bucket') @attr(resource='bucket')
@attr(method='get') @attr(method='get')
@attr(operation='default acl') @attr(operation='default acl')