From 3901c227f080f836fb91d7e959d84ebc4d838f8e Mon Sep 17 00:00:00 2001 From: Haibo Lin Date: Fri, 18 Oct 2019 15:39:54 +0800 Subject: [PATCH] Fix crash on unsigned packages JIRA: COMPOSE-3869 Signed-off-by: Haibo Lin --- pungi/phases/gather/methods/method_deps.py | 2 +- tests/test_gather_method_deps.py | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/pungi/phases/gather/methods/method_deps.py b/pungi/phases/gather/methods/method_deps.py index d6575c01..285564d8 100644 --- a/pungi/phases/gather/methods/method_deps.py +++ b/pungi/phases/gather/methods/method_deps.py @@ -65,7 +65,7 @@ def raise_on_invalid_sigkeys(arch, variant, package_sets, result): ).append(forbidden_package) if invalid_sigkey_rpms: - package_sets["global"].raise_invalid_sigkeys_exception(invalid_sigkey_rpms) + package_sets[0]["global"].raise_invalid_sigkeys_exception(invalid_sigkey_rpms) def _format_packages(pkgs): diff --git a/tests/test_gather_method_deps.py b/tests/test_gather_method_deps.py index 1225c9ba..8a96eb25 100644 --- a/tests/test_gather_method_deps.py +++ b/tests/test_gather_method_deps.py @@ -99,3 +99,18 @@ class TestWritePungiConfig(helpers.PungiTestCase): str(ctx.exception), 'No packages included in Server.x86_64 (no comps groups, no input packages, no prepopulate)') self.assertEqual(PungiWrapper.return_value.mock_calls, []) + + +class TestRaiseOnInvalidSigkeys(helpers.PungiTestCase): + + def test_raise_on_invalid_sigkeys(self): + pkgset = { + "global": mock.Mock(), + } + pkgset["global"].invalid_sigkey_rpms = [{'name': 'pkg1'}] + pkgset["global"].raise_invalid_sigkeys_exception = mock.Mock(side_effect=RuntimeError()) + result = { + 'rpm': [{'path': 'pkg1-1-1.el7'}], + } + with self.assertRaises(RuntimeError): + deps.raise_on_invalid_sigkeys('', '', [pkgset], result)