modules/fm-orchestrator
1
0
Fork 0
mirror of https://pagure.io/fm-orchestrator.git synced 2026-02-12 09:34:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Raise an exception in case getRPMHeaders return an empty dict or does not return the RPM license.

Browse Source
This commit is contained in:
Jan Kaluza
2018-12-18 16:28:47 +01:00
parent f47cc39de9
commit e17fdbdb5a
2 changed files with 66 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
module_build_service/builder/KojiContentGenerator.py
View File

@@ -277,6 +277,12 @@ class KojiContentGenerator(object):
# store the exclusivearch and excludearch lists. For each RPM, store the 'license' and
# also other useful data from the Build associated with the RPM.
for rpm, headers in zip(src_rpms.values() + binary_rpms.values(), rpms_headers):
if not headers:
raise RuntimeError(
"No RPM headers received from Koji for RPM %s" % rpm["name"])
if "license" not in headers:
raise RuntimeError(
"No RPM 'license' header received from Koji for RPM %s" % rpm["name"])
build = builds[rpm["build_id"]]
if "exclusivearch" in headers and "excludearch" in headers:
build["exclusivearch"] = headers["exclusivearch"]

60
tests/test_content_generator.py
View File

@@ -432,6 +432,66 @@ class TestBuild:
assert rpms == []
koji_session.multiCall.assert_not_called()
@patch("koji.ClientSession")
def test_koji_rpms_in_tag_empty_headers(self, ClientSession):
koji_session = ClientSession.return_value
koji_session.getUser.return_value = GET_USER_RV
koji_session.getTag.return_value = {"arches": "x86_64"}
rpms = [
{
'id': 1,
'arch': 'src',
'epoch': None,
'build_id': 875991,
'name': 'module-build-macros',
'release': '1.module_92011fe6',
'version': '0.1'
},
{
'id': 2,
'arch': 'noarch',
'epoch': None,
'build_id': 875991,
'name': 'module-build-macros',
'release': '1.module_92011fe6',
'version': '0.1'
},
]
builds = [
{
'build_id': 875991,
'epoch': None,
'name': 'module-build-macros',
'release': '1.module_92011fe6',
'version': '0.1',
'nvr': 'module-build-macros-0.1-1.module_92011fe6',
}
]
koji_session.listTaggedRPMS.return_value = (rpms, builds)
koji_session.multiCall.side_effect = [
# getRPMHeaders response
[[{}], [{}]]
]
with pytest.raises(RuntimeError) as cm:
self.cg._koji_rpms_in_tag("tag")
assert str(cm.value) == (
"No RPM headers received from Koji for RPM module-build-macros")
koji_session.multiCall.side_effect = [
# getRPMHeaders response
[[{"something": "x"}], [{}]]
]
with pytest.raises(RuntimeError) as cm:
self.cg._koji_rpms_in_tag("tag")
assert str(cm.value) == (
"No RPM 'license' header received from Koji for RPM module-build-macros")
def _add_test_rpm(self, nevra, srpm_nevra, multilib=None,
koji_srpm_nevra=None, excludearch=None, exclusivearch=None,
license=None):