particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

don't user full listTags in list-groups call

Browse source 
Fixes: https://pagure.io/koji/issue/1954
This commit is contained in:
Tomas Kopecek 2020-01-23 13:48:24 +01:00
parent d103176de3
commit 4edb9b15c2
2 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
cli/koji_cli/commands.py
View file

@ -2597,23 +2597,33 @@ def anon_handle_list_groups(goptions, session, args):
opts['event'] = event['id']
event['timestr'] = time.asctime(time.localtime(event['ts']))
print("Querying at event %(id)i (%(timestr)s)" % event)
tags = dict([(x['id'], x['name']) for x in session.listTags()])
tmp_list = [(x['name'], x) for x in session.getTagGroups(args[0], **opts)]
tmp_list.sort()
groups = [x[1] for x in tmp_list]
tags_cache = {}
def get_cached_tag(tag_id):
if tag_id not in tags_cache:
tag = session.getTag(tag_id, strict=False)
if tag is None:
tags_cache[tag_id] = tag_id
else:
tags_cache[tag_id] = tag['name']
return tags_cache[tag_id]
for group in groups:
if len(args) > 1 and group['name'] != args[1]:
continue
print("%s [%s]" % (group['name'], tags.get(group['tag_id'], group['tag_id'])))
print("%s [%s]" % (group['name'], get_cached_tag(group['tag_id'])))
groups = [(x['name'], x) for x in group['grouplist']]
groups.sort()
for x in [x[1] for x in groups]:
x['tag_name'] = tags.get(x['tag_id'], x['tag_id'])
x['tag_name'] = get_cached_tag(x['tag_id'])
print_group_list_req_group(x)
pkgs = [(x['package'], x) for x in group['packagelist']]
pkgs.sort()
for x in [x[1] for x in pkgs]:
x['tag_name'] = tags.get(x['tag_id'], x['tag_id'])
x['tag_name'] = get_cached_tag(x['tag_id'])
print_group_list_req_package(x)

9
tests/test_cli/test_list_groups.py
View file

@ -172,7 +172,14 @@ class TestListGroups(utils.CliTestCase):
pkg['tag_name'] = tags.get(pkg['tag_id'], pkg['tag_id'])
expected += " %(package)s: %(basearchonly)s, %(type)s [%(tag_name)s]" % pkg + "\n"
self.session.listTags.return_value = _list_tags
#self.session.listTags.return_value = _list_tags
def get_tag(tag_id, strict=False):
self.assertFalse(strict)
for tag in _list_tags:
if tag['id'] == tag_id:
return tag
return None
self.session.getTag.side_effect = get_tag
self.session.getTagGroups.return_value = _get_tag_groups
args = ['fedora26-build']
args += [query_group] if query_group != '' else []