From: Tim Burke Date: Tue, 12 Sep 2017 18:42:35 +0000 (-0600) Subject: Care less about ordering when checking grants X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F186%2Fhead;p=s3-tests.git Care less about ordering when checking grants Some tests, like test_object_header_acl_grants and test_bucket_header_acl_grants, use the same id for all permissions. Sort() is stable, so those tests end up testing the order of acl grants returned by Boto. Not sure, but I think this may in turn depend on the order of HTTP headers, where the order is not significant. Signed-off-by: Tim Burke --- diff --git a/s3tests/functional/test_s3.py b/s3tests/functional/test_s3.py index dd943ffa..511ec420 100644 --- a/s3tests/functional/test_s3.py +++ b/s3tests/functional/test_s3.py @@ -81,8 +81,8 @@ def check_grants(got, want): in any order. """ eq(len(got), len(want)) - got = sorted(got, key=operator.attrgetter('id')) - want = sorted(want, key=operator.itemgetter('id')) + got = sorted(got, key=operator.attrgetter('id', 'permission')) + want = sorted(want, key=operator.itemgetter('id', 'permission')) for g, w in zip(got, want): w = dict(w) eq(g.permission, w.pop('permission'))