changeset 8379:a893d2ce599c stable

tests: fix test_api_get_repo_by_non_admin dependency on other users having repo permissions
author Mads Kiilerich <mads@kiilerich.com>
date Thu, 30 Apr 2020 15:35:51 +0200
parents 754dbf31b551
children 201135e6548b
files kallithea/tests/api/api_base.py
diffstat 1 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/tests/api/api_base.py	Thu Apr 30 15:23:04 2020 +0200
+++ b/kallithea/tests/api/api_base.py	Thu Apr 30 15:35:51 2020 +0200
@@ -638,32 +638,32 @@
         response = api_call(self, params)
 
         repo = RepoModel().get_by_repo_name(self.REPO)
-        ret = repo.get_api_data()
+        assert len(repo.repo_to_perm) >= 2  # make sure we actually are testing something - probably the default 2 permissions, possibly more
+
+        expected = repo.get_api_data()
 
         members = []
-        followers = []
-        assert 2 == len(repo.repo_to_perm)
         for user in repo.repo_to_perm:
             perm = user.permission.permission_name
             user_obj = user.user
             user_data = {'name': user_obj.username, 'type': "user",
                          'permission': perm}
             members.append(user_data)
-
         for user_group in repo.users_group_to_perm:
             perm = user_group.permission.permission_name
             user_group_obj = user_group.users_group
             user_group_data = {'name': user_group_obj.users_group_name,
                                'type': "user_group", 'permission': perm}
             members.append(user_group_data)
+        expected['members'] = members
+
+        followers = []
 
         for user in repo.followers:
             followers.append(user.user.get_api_data())
 
-        ret['members'] = members
-        ret['followers'] = followers
+        expected['followers'] = followers
 
-        expected = ret
         try:
             self._compare_ok(id_, expected, given=response.body)
         finally: