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

use requests in sidetag plugin

Browse source
This commit is contained in:
Mike McLean 2024-06-24 11:13:49 -04:00
parent 1bdb0598b8
commit e3707bed7a
2 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
plugins/hub/sidetag_hub.py
View file

@ -23,6 +23,7 @@ from kojihub import (
readInheritanceData,
)
from kojihub.db import QueryProcessor, nextval
from kojihub.repos import request_repo
CONFIG_FILE = "/etc/koji-hub/plugins/sidetag.conf"
CONFIG = None
@ -156,13 +157,14 @@ def createSideTag(basetag, debuginfo=False, suffix=None):
_create_build_target(sidetag_name, sidetag_id, sidetag_id)
if TRIGGER_NEW_REPO:
# little higher priority than other newRepo tasks
args = koji.encode_args(sidetag_name, debuginfo=debuginfo)
task_id = make_task('newRepo', args, priority=14, channel='createrepo')
check = request_repo(sidetag_id)
request = check['request']
else:
task_id = None
request = None
# in our case, the request will not have a task yet
task_id = None
return {"name": sidetag_name, "id": sidetag_id, 'task_id': task_id}
return {"name": sidetag_name, "id": sidetag_id, 'task_id': task_id, 'request': request}
@export

4
tests/test_plugins/test_sidetag_hub.py
View file

@ -51,7 +51,7 @@ class TestCreateSideTagHub(unittest.TestCase):
self._create_tag.return_value = 12346
ret = sidetag_hub.createSideTag('base_tag')
self.assertEqual(ret, {'name': sidetag_name, 'id': 12346, 'task_id': None})
self.assertEqual(ret, {'name': sidetag_name, 'id': 12346, 'task_id': None, 'request': None})
self.get_user.assert_called_once_with(23, strict=True)
self.get_tag.assert_called_once_with(self.basetag['name'], strict=True)
@ -83,7 +83,7 @@ class TestCreateSideTagHub(unittest.TestCase):
sidetag_hub.NAME_TEMPLATE = '{basetag}-sidetag-{tag_id}'
ret = sidetag_hub.createSideTag('base_tag', debuginfo=True, suffix='suffix')
self.assertEqual(ret, {'name': sidetag_name, 'id': 12346, 'task_id': None})
self.assertEqual(ret, {'name': sidetag_name, 'id': 12346, 'task_id': None, 'request': None})
def test_createsidetag_template_forbidden_suffix(self):
sidetag_hub.ALLOWED_SUFFIXES = ['suffix', 'another']