almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity

pkgset: Added modules to variant in correct format

Browse Source 
The data parsed from variants.xml uses a different format that what we
added in `_add_module_to_variant`. This leads to crashes later.

JIRA: COMPOSE-3746
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2019-08-05 10:56:44 +02:00
parent c00162413c
commit 8994aa5d88
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pungi/phases/pkgset/sources/source_koji.py
View File

@ -258,7 +258,7 @@ def _add_module_to_variant(koji_wrapper, variant, build, add_to_variant_modules=
pass pass
if add_to_variant_modules: if add_to_variant_modules:
variant.modules.append(nsvc) variant.modules.append({"name": nsvc, "glob": False})
return nsvc return nsvc

17
tests/test_pkgset_source_koji.py
View File

@ -702,7 +702,7 @@ class TestAddModuleToVariant(unittest.TestCase):
arch_mmds={ arch_mmds={
"x86_64": {"m1:latest:20190101:cafe": MockModule("/koji/m1.x86_64.txt")} "x86_64": {"m1:latest:20190101:cafe": MockModule("/koji/m1.x86_64.txt")}
}, },
modules=["m1:latest-20190101:cafe"], modules=[{"name": "m1:latest-20190101:cafe", "glob": False}],
) )
source_koji._add_module_to_variant(self.koji, variant, self.buildinfo) source_koji._add_module_to_variant(self.koji, variant, self.buildinfo)
@ -719,7 +719,9 @@ class TestAddModuleToVariant(unittest.TestCase):
}, },
}, },
) )
self.assertEqual(variant.modules, ["m1:latest-20190101:cafe"]) self.assertEqual(
variant.modules, [{"name": "m1:latest-20190101:cafe", "glob": False}]
)
def test_adding_module_with_add_module(self): def test_adding_module_with_add_module(self):
variant = mock.Mock( variant = mock.Mock(
@ -741,7 +743,9 @@ class TestAddModuleToVariant(unittest.TestCase):
}, },
}, },
) )
self.assertEqual(variant.modules, ["module:master:20190318:abcdef"]) self.assertEqual(
variant.modules, [{"name": "module:master:20190318:abcdef", "glob": False}]
)
def test_adding_module_to_existing_with_add_module(self): def test_adding_module_to_existing_with_add_module(self):
variant = mock.Mock( variant = mock.Mock(
@ -749,7 +753,7 @@ class TestAddModuleToVariant(unittest.TestCase):
arch_mmds={ arch_mmds={
"x86_64": {"m1:latest:20190101:cafe": MockModule("/koji/m1.x86_64.txt")} "x86_64": {"m1:latest:20190101:cafe": MockModule("/koji/m1.x86_64.txt")}
}, },
modules=["m1:latest-20190101:cafe"], modules=[{"name": "m1:latest-20190101:cafe", "glob": False}],
) )
source_koji._add_module_to_variant( source_koji._add_module_to_variant(
@ -770,5 +774,8 @@ class TestAddModuleToVariant(unittest.TestCase):
) )
self.assertEqual( self.assertEqual(
variant.modules, variant.modules,
["m1:latest-20190101:cafe", "module:master:20190318:abcdef"], [
{"name": "m1:latest-20190101:cafe", "glob": False},
{"name": "module:master:20190318:abcdef", "glob": False},
],
) )