mirror of
https://github.com/ceph/s3-tests.git
synced 2024-11-27 23:31:41 +00:00
Merge pull request #424 from psathyan/fix_check_grants
Improving check_grants reliability
This commit is contained in:
commit
a38cdb1dd5
1 changed files with 8 additions and 0 deletions
|
@ -4490,12 +4490,19 @@ def check_access_denied(fn, *args, **kwargs):
|
|||
status = _get_status(e.response)
|
||||
eq(status, 403)
|
||||
|
||||
|
||||
def check_grants(got, want):
|
||||
"""
|
||||
Check that grants list in got matches the dictionaries in want,
|
||||
in any order.
|
||||
"""
|
||||
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):
|
||||
w = dict(w)
|
||||
g = dict(g)
|
||||
|
@ -4507,6 +4514,7 @@ def check_grants(got, want):
|
|||
eq(g['Grantee'].pop('EmailAddress', None), w['EmailAddress'])
|
||||
eq(g, {'Grantee': {}})
|
||||
|
||||
|
||||
@attr(resource='bucket')
|
||||
@attr(method='get')
|
||||
@attr(operation='default acl')
|
||||
|
|
Loading…
Reference in a new issue