kallithea Changeset - 3edb29cfca8e

Changeset - 3edb29cfca8e

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich (mads) - 5 years ago 2020-12-14 20:24:19
mads@kiilerich.com

Grafted from: e916c71c57f3

tests: always pass username as cur_user

Passing a whole User wouldn't work if actually using celery and thus
serializing the parameters. The test scenario was thus different from actual
runtime.

1 file changed with 5 insertions and 5 deletions:

kallithea/tests/models/test_permissions.py

0 comments (0 inline, 0 general)

kallithea/tests/models/test_permissions.py

➞

Show inline comments

@@ @@ -187,25 +187,25 @@ class TestPermissions(base.TestControlle @@
         assert u1_auth.repository_group_permissions.get('group1') == 'group.none'
         assert u1_auth.repository_group_permissions.get('group2') == 'group.none'
         a1_auth = AuthUser(user_id=self.anon.user_id)
         assert a1_auth.repository_group_permissions.get('group1') == 'group.none'
         assert a1_auth.repository_group_permissions.get('group2') == 'group.none'
         # add repo to group
         name = kallithea.URL_SEP.join([self.g1.group_name, 'test_perm'])
         self.test_repo = fixture.create_repo(name=name,
                                              repo_type='hg',
                                              repo_group=self.g1,
-                                             cur_user=self.u1,)
+                                             cur_user=self.u1.username)
         u1_auth = AuthUser(user_id=self.u1.user_id)
         assert u1_auth.repository_group_permissions.get('group1') == 'group.none'
         assert u1_auth.repository_group_permissions.get('group2') == 'group.none'
         a1_auth = AuthUser(user_id=self.anon.user_id)
         assert a1_auth.repository_group_permissions.get('group1') == 'group.none'
         assert a1_auth.repository_group_permissions.get('group2') == 'group.none'
         # grant permission for u2 !
         RepoGroupModel().grant_user_permission(repo_group=self.g1, user=self.u2,
                                                perm='group.read')
@@ @@ -425,49 +425,49 @@ class TestPermissions(base.TestControlle @@
                               ])
     def test_inactive_user_group_does_not_affect_repo_permissions(self):
         self.ug1 = fixture.create_user_group('G1')
         user_group_model = UserGroupModel()
         user_group_model.add_user_to_group(self.ug1, self.u1)
         user_group_model.update(self.ug1, {'users_group_active': False})
         # note: make u2 repo owner rather than u1, because the owner always has
         # admin permissions
         self.test_repo = fixture.create_repo(name='myownrepo',
                                              repo_type='hg',
                                              cur_user=self.u2)
+                                             cur_user=self.u2.username)
         # enable admin access for user group on repo
         RepoModel().grant_user_group_permission(self.test_repo,
                                                 group_name=self.ug1,
                                                 perm='repository.admin')
         # enable only write access for default user on repo
         RepoModel().grant_user_permission(self.test_repo,
                                           user='default',
                                           perm='repository.write')
         meta.Session().commit()
         u1_auth = AuthUser(user_id=self.u1.user_id)
         assert u1_auth.repository_permissions['myownrepo'] == 'repository.write'
     def test_inactive_user_group_does_not_affect_repo_permissions_inverse(self):
         self.ug1 = fixture.create_user_group('G1')
         user_group_model = UserGroupModel()
         user_group_model.add_user_to_group(self.ug1, self.u1)
         user_group_model.update(self.ug1, {'users_group_active': False})
         # note: make u2 repo owner rather than u1, because the owner always has
         # admin permissions
         self.test_repo = fixture.create_repo(name='myownrepo',
                                              repo_type='hg',
                                              cur_user=self.u2)
+                                             cur_user=self.u2.username)
         # enable only write access for user group on repo
         RepoModel().grant_user_group_permission(self.test_repo,
                                                 group_name=self.ug1,
                                                 perm='repository.write')
         # enable admin access for default user on repo
         RepoModel().grant_user_permission(self.test_repo,
                                           user='default',
                                           perm='repository.admin')
         meta.Session().commit()
         u1_auth = AuthUser(user_id=self.u1.user_id)
         assert u1_auth.repository_permissions['myownrepo'] == 'repository.admin'
@@ @@ -549,45 +549,45 @@ class TestPermissions(base.TestControlle @@
         UserGroupModel().grant_user_permission(self.ug2,
                                                user='default',
                                                perm='usergroup.admin')
         meta.Session().commit()
         u1_auth = AuthUser(user_id=self.u1.user_id)
         assert u1_auth.user_group_permissions['G1'] == 'usergroup.read'
         assert u1_auth.user_group_permissions['G2'] == 'usergroup.admin'
     def test_owner_permissions_doesnot_get_overwritten_by_group(self):
         # create repo as USER,
         self.test_repo = fixture.create_repo(name='myownrepo',
                                              repo_type='hg',
                                              cur_user=self.u1)
+                                             cur_user=self.u1.username)
         # he has permissions of admin as owner
         u1_auth = AuthUser(user_id=self.u1.user_id)
         assert u1_auth.repository_permissions['myownrepo'] == 'repository.admin'
         # set his permission as user group, he should still be admin
         self.ug1 = fixture.create_user_group('G1')
         UserGroupModel().add_user_to_group(self.ug1, self.u1)
         RepoModel().grant_user_group_permission(self.test_repo,
                                                  group_name=self.ug1,
                                                  perm='repository.none')
         meta.Session().commit()
         u1_auth = AuthUser(user_id=self.u1.user_id)
         assert u1_auth.repository_permissions['myownrepo'] == 'repository.admin'
     def test_owner_permissions_doesnot_get_overwritten_by_others(self):
         # create repo as USER,
         self.test_repo = fixture.create_repo(name='myownrepo',
                                              repo_type='hg',
                                              cur_user=self.u1)
+                                             cur_user=self.u1.username)
         # he has permissions of admin as owner
         u1_auth = AuthUser(user_id=self.u1.user_id)
         assert u1_auth.repository_permissions['myownrepo'] == 'repository.admin'
         # set his permission as user, he should still be admin
         RepoModel().grant_user_permission(self.test_repo, user=self.u1,
                                           perm='repository.none')
         meta.Session().commit()
         u1_auth = AuthUser(user_id=self.u1.user_id)
         assert u1_auth.repository_permissions['myownrepo'] == 'repository.admin'
     def _test_def_perm_equal(self, user, change_factor=0):

0 comments (0 inline, 0 general)