plone.api/fix_tests: fix obvious test failures
Alexander Loechel <jenkins-z4DKO/[email protected]> Thu, 27 Jul 2017 01:55:24 -0700 (PDT)
| Newsgroups | gmane.comp.web.zope.plone.cvs |
|---|---|
| Message-ID | <[email protected]> |
Repository: plone.api Branch: refs/heads/fix_tests Date: 2017-07-27T10:55:08+02:00 Author: Alexander Loechel (loechel) <[email protected]> Commit: https://github.com/plone/plone.api/commit/e2ec99528e86bf0069eba609b1869844f2ab437f fix obvious test failures Files changed: M docs/group.rst M src/plone/api/tests/test_group.py M src/plone/api/tests/test_user.py diff --git a/docs/group.rst b/docs/group.rst index 800bb11..6ffbe53 100644 --- a/docs/group.rst +++ b/docs/group.rst @@ -142,9 +142,11 @@ Groups may be filtered by member. By passing the ``username`` parameter, .. invisible-code-block: python - self.assertEqual(groups[0].id, 'Reviewers') - self.assertEqual(groups[1].id, 'AuthenticatedUsers') - self.assertEqual(groups[2].id, 'staff') + group_list = [g.id for g in groups] + self.assertItemsEqual( + group_list, + ['Reviewers', 'AuthenticatedUsers', 'staff'], + ) You can also pass the user directly to :meth:`api.group.get_groups`: @@ -154,9 +156,11 @@ You can also pass the user directly to :meth:`api.group.get_groups`: .. invisible-code-block: python - self.assertEqual(groups[0].id, 'Reviewers') - self.assertEqual(groups[1].id, 'AuthenticatedUsers') - self.assertEqual(groups[2].id, 'staff') + group_list = [g.id for g in groups] + self.assertItemsEqual( + group_list, + ['Reviewers', 'AuthenticatedUsers', 'staff'], + ) Get group members ----------------- diff --git a/src/plone/api/tests/test_group.py b/src/plone/api/tests/test_group.py index d038b0a..187b992 100644 --- a/src/plone/api/tests/test_group.py +++ b/src/plone/api/tests/test_group.py @@ -532,12 +532,12 @@ def test_local_roles_without_inheritance(self): ) # Add the editor-role as global role api.group.grant_roles(groupname='foo', roles=['Editor']) - self.assertEqual( + self.assertItemsEqual( ['Authenticated', 'Editor'], api.group.get_roles(groupname='foo'), ) # local_roles plus global_roles - self.assertEqual( + self.assertItemsEqual( ['Authenticated', 'Editor'], api.group.get_roles(groupname='foo', obj=folder), ) @@ -551,7 +551,7 @@ def test_local_roles_without_inheritance(self): api.group.grant_roles( groupname='foo', roles=['Contributor'], obj=folder, ) - self.assertEqual( + self.assertItemsEqual( ['Contributor'], api.group.get_roles(groupname='foo', obj=folder, inherit=False), ) @@ -656,12 +656,12 @@ def getRoles(self, principal_id): ) # The adapter role in in the local roles but not persistent - self.assertEqual( + self.assertItemsEqual( api.group.get_roles(groupname='foo', obj=folder, inherit=False), ['Contributor', 'Reviewer'], ) local_roles = getattr(folder, '__ac_local_roles__', {}) - self.assertEqual( + self.assertItemsEqual( local_roles.get('foo'), ['Contributor'], ) diff --git a/src/plone/api/tests/test_user.py b/src/plone/api/tests/test_user.py index 256fd40..68f3796 100644 --- a/src/plone/api/tests/test_user.py +++ b/src/plone/api/tests/test_user.py @@ -475,11 +475,11 @@ def test_get_permissions_root(self): } for k, v in PERMISSIONS.items(): - self.assertItemsEqual( + self.assertEqual( v, api.user.get_permissions(username='chuck').get(k, None), ) - self.assertItemsEqual( + self.assertEqual( v, api.user.get_permissions(user=user).get(k, None), ) ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot