From 8587f27a220953117a7b926b1211e87b0d4a5474 Mon Sep 17 00:00:00 2001 From: Yu Ming Zhu Date: Jun 18 2021 11:29:38 +0000 Subject: [policy] use "name" in result of lookup_name for CGs fixes: #2915 --- diff --git a/hub/kojihub.py b/hub/kojihub.py index 5fb6cdb..876c983 100644 --- a/hub/kojihub.py +++ b/hub/kojihub.py @@ -9361,7 +9361,7 @@ def policy_get_cgs(data): # pull cg info out # note that br_id will be None if a component had no buildroot if 'cg_list' in data: - cgs = [lookup_name('content_generator', cg, strict=True) + cgs = [lookup_name('content_generator', cg, strict=True)['name'] for cg in data['cg_list']] return set(cgs) # otherwise try buildroot data diff --git a/tests/test_hub/test_policy_tests.py b/tests/test_hub/test_policy_tests.py index 3574d5f..1522be5 100644 --- a/tests/test_hub/test_policy_tests.py +++ b/tests/test_hub/test_policy_tests.py @@ -136,11 +136,12 @@ class TestPolicyGetCGs(unittest.TestCase): 'build': 'whatever', 'buildroots': [], } + def my_lookup_name(table, info, strict=False, create=False): self.assertEqual(strict, True) self.assertEqual(create, False) self.assertEqual(table, 'content_generator') - return "cg %i" % info + return {'id': info, 'name': "cg %i" % info} self.lookup_name.side_effect = my_lookup_name result = kojihub.policy_get_cgs(data)