Mercurial > kallithea
changeset 8376:797767469152 stable
tests: simplify test_permissions.py - don't create temporary 'perms' dict
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Thu, 30 Apr 2020 14:42:12 +0200 |
| parents | 33427561b389 |
| children | 86bf2cd71a65 |
| files | kallithea/tests/models/test_permissions.py |
| diffstat | 1 files changed, 10 insertions(+), 44 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/tests/models/test_permissions.py Thu Apr 30 13:49:02 2020 +0200 +++ b/kallithea/tests/models/test_permissions.py Thu Apr 30 14:42:12 2020 +0200 @@ -68,13 +68,7 @@ def test_default_perms_set(self): u1_auth = AuthUser(user_id=self.u1.user_id) - perms = { - 'repositories_groups': {}, - 'global': set(['hg.create.repository', 'repository.read', - 'hg.register.manual_activate']), - 'repositories': {base.HG_REPO: 'repository.read'} - } - assert u1_auth.permissions['repositories'][base.HG_REPO] == perms['repositories'][base.HG_REPO] + assert u1_auth.permissions['repositories'][base.HG_REPO] == 'repository.read' new_perm = 'repository.write' RepoModel().grant_user_permission(repo=base.HG_REPO, user=self.u1, perm=new_perm) @@ -85,12 +79,7 @@ def test_default_admin_perms_set(self): a1_auth = AuthUser(user_id=self.a1.user_id) - perms = { - 'repositories_groups': {}, - 'global': set(['hg.admin', 'hg.create.write_on_repogroup.true']), - 'repositories': {base.HG_REPO: 'repository.admin'} - } - assert a1_auth.permissions['repositories'][base.HG_REPO] == perms['repositories'][base.HG_REPO] + assert a1_auth.permissions['repositories'][base.HG_REPO] == 'repository.admin' new_perm = 'repository.write' RepoModel().grant_user_permission(repo=base.HG_REPO, user=self.a1, perm=new_perm) @@ -98,33 +87,22 @@ # cannot really downgrade admins permissions !? they still gets set as # admin ! u1_auth = AuthUser(user_id=self.a1.user_id) - assert u1_auth.permissions['repositories'][base.HG_REPO] == perms['repositories'][base.HG_REPO] + assert u1_auth.permissions['repositories'][base.HG_REPO] == 'repository.admin' def test_default_group_perms(self): self.g1 = fixture.create_repo_group('test1', skip_if_exists=True) self.g2 = fixture.create_repo_group('test2', skip_if_exists=True) u1_auth = AuthUser(user_id=self.u1.user_id) - perms = { - 'repositories_groups': {'test1': 'group.read', 'test2': 'group.read'}, - 'global': set(Permission.DEFAULT_USER_PERMISSIONS), - 'repositories': {base.HG_REPO: 'repository.read'} - } - assert u1_auth.permissions['repositories'][base.HG_REPO] == perms['repositories'][base.HG_REPO] - assert u1_auth.permissions['repositories_groups'] == perms['repositories_groups'] - assert u1_auth.permissions['global'] == perms['global'] + assert u1_auth.permissions['repositories'][base.HG_REPO] == 'repository.read' + assert u1_auth.permissions['repositories_groups'] == {'test1': 'group.read', 'test2': 'group.read'} + assert u1_auth.permissions['global'] == set(Permission.DEFAULT_USER_PERMISSIONS) def test_default_admin_group_perms(self): self.g1 = fixture.create_repo_group('test1', skip_if_exists=True) self.g2 = fixture.create_repo_group('test2', skip_if_exists=True) a1_auth = AuthUser(user_id=self.a1.user_id) - perms = { - 'repositories_groups': {'test1': 'group.admin', 'test2': 'group.admin'}, - 'global': set(['hg.admin', 'hg.create.write_on_repogroup.true']), - 'repositories': {base.HG_REPO: 'repository.admin'} - } - - assert a1_auth.permissions['repositories'][base.HG_REPO] == perms['repositories'][base.HG_REPO] - assert a1_auth.permissions['repositories_groups'] == perms['repositories_groups'] + assert a1_auth.permissions['repositories'][base.HG_REPO] == 'repository.admin' + assert a1_auth.permissions['repositories_groups'] == {'test1': 'group.admin', 'test2': 'group.admin'} def test_propagated_permission_from_users_group_by_explicit_perms_exist(self): # make group @@ -158,14 +136,8 @@ perm=new_perm_gr) # check perms u3_auth = AuthUser(user_id=self.u3.user_id) - perms = { - 'repositories_groups': {}, - 'global': set(['hg.create.repository', 'repository.read', - 'hg.register.manual_activate']), - 'repositories': {base.HG_REPO: 'repository.read'} - } assert u3_auth.permissions['repositories'][base.HG_REPO] == new_perm_gr - assert u3_auth.permissions['repositories_groups'] == perms['repositories_groups'] + assert u3_auth.permissions['repositories_groups'] == {} # note: it is unclear which repo group we are happy to not see here ... def test_propagated_permission_from_users_group_lower_weight(self): # make group @@ -189,14 +161,8 @@ perm=new_perm_l) # check perms u1_auth = AuthUser(user_id=self.u1.user_id) - perms = { - 'repositories_groups': {}, - 'global': set(['hg.create.repository', 'repository.read', - 'hg.register.manual_activate']), - 'repositories': {base.HG_REPO: 'repository.write'} - } assert u1_auth.permissions['repositories'][base.HG_REPO] == new_perm_h - assert u1_auth.permissions['repositories_groups'] == perms['repositories_groups'] + assert u1_auth.permissions['repositories_groups'] == {} # note: it is unclear which repo group we are happy to not see here ... def test_repo_in_group_permissions(self): self.g1 = fixture.create_repo_group('group1', skip_if_exists=True)