From 0f4f722f252dccfdfc29ed26ddcf900e0abab6b7 Mon Sep 17 00:00:00 2001 From: Pragadeeswaran Sathyanarayanan Date: Tue, 28 Dec 2021 20:56:23 +0530 Subject: [PATCH] Improving check_grants reliability Signed-off-by: Pragadeeswaran Sathyanarayanan (cherry picked from commit 5f96a32045aa50da674df000f462def06308e10b) --- s3tests_boto3/functional/test_s3.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/s3tests_boto3/functional/test_s3.py b/s3tests_boto3/functional/test_s3.py index 7d7bb85..47b24b8 100644 --- a/s3tests_boto3/functional/test_s3.py +++ b/s3tests_boto3/functional/test_s3.py @@ -4446,12 +4446,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) @@ -4463,6 +4470,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')