From 0f75baac74caeee92eb71db1d7543c6db419dedc Mon Sep 17 00:00:00 2001 From: Tomas Kopecek Date: Tue, 27 Jun 2023 13:15:01 +0200 Subject: [PATCH] Fix user_in_group policy test Related: https://pagure.io/koji/issue/3858 --- kojihub/auth.py | 5 ++++- tests/test_hub/test_policy_tests.py | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/kojihub/auth.py b/kojihub/auth.py index a858db26..dc52b813 100644 --- a/kojihub/auth.py +++ b/kojihub/auth.py @@ -776,7 +776,10 @@ def get_user_groups(user_id): 'user_id=%(user_id)i'], joins=['users ON group_id = users.id'], values={'t_group': t_group, 'user_id': user_id}) - return query.execute() + groups = {} + for gdata in query.execute(): + groups[gdata['group_id']] = gdata['name'] + return groups def get_user_perms(user_id): diff --git a/tests/test_hub/test_policy_tests.py b/tests/test_hub/test_policy_tests.py index 1fab2615..95d791d8 100644 --- a/tests/test_hub/test_policy_tests.py +++ b/tests/test_hub/test_policy_tests.py @@ -742,7 +742,7 @@ class IsBuildOwnerTest(unittest.TestCase): self.get_build.return_value = {'build_id': data['build'], 'owner_id': 3} self.get_user.return_value = {'id': 2, 'name': 'testuser', 'usertype': 2} self.policy_get_user.return_value = {'id': 3, 'name': 'username'} - self.get_user_groups.return_value = [2] + self.get_user_groups.return_value = {2: 'group_name'} obj = kojihub.IsBuildOwnerTest('isbuildownertest - owner group') self.assertTrue(obj.run(data)) self.get_build.assert_called_once_with(data['build'])