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

Fix tests

Browse Source 
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2019-08-01 11:19:51 +02:00
parent 11779f6644
commit 054b91c798
4 changed files with 165 additions and 203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pungi/phases/gather/methods/method_hybrid.py
View File

@ -92,8 +92,8 @@ class GatherMethodHybrid(pungi.phases.gather.method.GatherMethodBase):
if arch not in self.package_maps:
pkg_map = {}
for pkgset in self.package_sets:
for pkg_arch in pkgset[arch].rpms_by_arch:
for pkg in pkgset[arch].rpms_by_arch[pkg_arch]:
for pkg_arch in pkgset.package_sets[arch].rpms_by_arch:
for pkg in pkgset.package_sets[arch].rpms_by_arch[pkg_arch]:
pkg_map[_fmt_nevra(pkg, pkg_arch)] = pkg
self.package_maps[arch] = pkg_map
@ -119,8 +119,8 @@ class GatherMethodHybrid(pungi.phases.gather.method.GatherMethodBase):
more than one debuginfo package with the same name.
"""
for pkgset in self.package_sets:
for pkg_arch in pkgset[self.arch].rpms_by_arch:
for pkg in pkgset[self.arch].rpms_by_arch[pkg_arch]:
for pkg_arch in pkgset.package_sets[self.arch].rpms_by_arch:
for pkg in pkgset.package_sets[self.arch].rpms_by_arch[pkg_arch]:
self.debuginfo[pkg.arch][pkg.name].add(pkg)
def _get_debuginfo(self, name, arch):
@ -134,8 +134,8 @@ class GatherMethodHybrid(pungi.phases.gather.method.GatherMethodBase):
"""
expanded = set()
for pkgset in self.package_sets:
for pkg_arch in pkgset[self.arch].rpms_by_arch:
for pkg in pkgset[self.arch].rpms_by_arch[pkg_arch]:
for pkg_arch in pkgset.package_sets[self.arch].rpms_by_arch:
for pkg in pkgset.package_sets[self.arch].rpms_by_arch[pkg_arch]:
for pattern in patterns:
if fnmatch(pkg.name, pattern):
expanded.add(pkg)
@ -158,8 +158,8 @@ class GatherMethodHybrid(pungi.phases.gather.method.GatherMethodBase):
install_match = install % "*"
self.langpacks[name] = set()
for pkgset in self.package_sets:
for pkg_arch in pkgset[arch].rpms_by_arch:
for pkg in pkgset[arch].rpms_by_arch[pkg_arch]:
for pkg_arch in pkgset.package_sets[arch].rpms_by_arch:
for pkg in pkgset.package_sets[arch].rpms_by_arch[pkg_arch]:
if not fnmatch(pkg.name, install_match):
# Does not match the pattern, ignore...
continue

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

@ -187,9 +187,7 @@ class PkgsetSourceKoji(pungi.phases.pkgset.source.PkgsetSourceBase):
def get_pkgset_from_koji(compose, koji_wrapper, path_prefix):
event_info = get_koji_event_info(compose, koji_wrapper)
pkgsets = populate_global_pkgset(compose, koji_wrapper, path_prefix, event_info)
return pkgsets
return populate_global_pkgset(compose, koji_wrapper, path_prefix, event_info)
def _add_module_to_variant(koji_wrapper, variant, build, add_to_variant_modules=False):

46
tests/test_gather_method_hybrid.py
View File

@ -9,6 +9,7 @@ import sys
sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
from pungi.phases.gather.methods import method_hybrid as hybrid
from pungi.phases.pkgset.common import MaterializedPackageSet as PkgSet
from tests import helpers
@ -44,7 +45,9 @@ class TestMethodHybrid(helpers.PungiTestCase):
)
CW.return_value.get_langpacks.return_value = {"glibc": "glibc-langpack-%s"}
eg.return_value = ["foo", "bar"]
package_sets = [{"x86_64": mock.Mock(rpms_by_arch={"x86_64": [pkg]})}]
package_sets = [
PkgSet({"x86_64": mock.Mock(rpms_by_arch={"x86_64": [pkg]})}, {})
]
arch = "x86_64"
variant = compose.variants["Server"]
@ -104,6 +107,7 @@ class TestMethodHybrid(helpers.PungiTestCase):
CW.return_value.get_langpacks.return_value = {"foo": "foo-%s"}
m = hybrid.GatherMethodHybrid(compose)
m.package_sets = [
PkgSet(
{
"x86_64": mock.Mock(
rpms_by_arch={
@ -147,7 +151,9 @@ class TestMethodHybrid(helpers.PungiTestCase):
]
}
)
}
},
{},
)
]
m.prepare_langpacks("x86_64", compose.variants["Server"])
@ -158,6 +164,7 @@ class TestMethodHybrid(helpers.PungiTestCase):
m = hybrid.GatherMethodHybrid(compose)
m.arch = "x86_64"
m.package_sets = [
PkgSet(
{
"x86_64": mock.Mock(
rpms_by_arch={
@ -192,7 +199,9 @@ class TestMethodHybrid(helpers.PungiTestCase):
]
}
)
}
},
{},
)
]
expanded = m.expand_list(["foo*"])
@ -282,6 +291,13 @@ class TestRunSolver(HelperMixin, helpers.PungiTestCase):
self.phase = hybrid.GatherMethodHybrid(self.compose)
self.phase.multilib_methods = []
self.phase.arch = "x86_64"
self.phase.variant = self.compose.variants["Server"]
self.phase.package_sets = [
PkgSet(
{"x86_64": mock.Mock(rpms_by_arch={"x86_64": []})},
{"x86_64": "/path/for/p1"},
)
]
self.logfile1 = os.path.join(
self.compose.topdir, "logs/x86_64/hybrid-depsolver-Server-iter-1.x86_64.log"
)
@ -335,7 +351,7 @@ class TestRunSolver(HelperMixin, helpers.PungiTestCase):
mock.call(
self.config1,
"x86_64",
[self._repo("repo")],
["/path/for/p1"],
[],
platform="pl",
filter_packages=[("foo", None)],
@ -361,7 +377,6 @@ class TestRunSolver(HelperMixin, helpers.PungiTestCase):
}
po.return_value = ([("p-1-1", "x86_64", frozenset())], ["m1"])
self.phase.packages = {"p-1-1.x86_64": mock.Mock()}
self.phase.package_sets = [{"x86_64": mock.Mock(rpms_by_arch={"x86_64": []})}]
res = self.phase.run_solver(
self.compose.variants["Server"],
@ -391,7 +406,7 @@ class TestRunSolver(HelperMixin, helpers.PungiTestCase):
mock.call(
self.config1,
"x86_64",
[self._repo("repo")],
["/path/for/p1"],
[],
platform="pl",
filter_packages=["foo"],
@ -431,7 +446,7 @@ class TestRunSolver(HelperMixin, helpers.PungiTestCase):
mock.call(
self.config1,
"x86_64",
[self._repo("repo")],
["/path/for/p1"],
[],
platform=None,
filter_packages=[],
@ -501,7 +516,7 @@ class TestRunSolver(HelperMixin, helpers.PungiTestCase):
mock.call(
self.config1,
"x86_64",
[self._repo("repo")],
["/path/for/p1"],
[],
platform=None,
filter_packages=[],
@ -509,7 +524,7 @@ class TestRunSolver(HelperMixin, helpers.PungiTestCase):
mock.call(
self.config2,
"x86_64",
[self._repo("repo")],
["/path/for/p1"],
[],
platform=None,
filter_packages=[],
@ -528,7 +543,6 @@ class TestRunSolver(HelperMixin, helpers.PungiTestCase):
"pkg-1.0-1.x86_64": mock.Mock(),
"pkg-en-1.0-1.noarch": mock.Mock(),
}
self.phase.package_sets = [{"x86_64": mock.Mock(rpms_by_arch={"x86_64": []})}]
res = self.phase.run_solver(
self.compose.variants["Server"],
@ -567,7 +581,7 @@ class TestRunSolver(HelperMixin, helpers.PungiTestCase):
mock.call(
self.config1,
"x86_64",
[self._repo("repo")],
["/path/for/p1"],
[],
platform=None,
filter_packages=["foo"],
@ -575,7 +589,7 @@ class TestRunSolver(HelperMixin, helpers.PungiTestCase):
mock.call(
self.config2,
"x86_64",
[self._repo("repo")],
["/path/for/p1"],
[],
platform=None,
filter_packages=["foo"],
@ -661,7 +675,7 @@ class TestRunSolver(HelperMixin, helpers.PungiTestCase):
mock.call(
self.config1,
"x86_64",
[self._repo("repo")],
["/path/for/p1"],
[],
platform=None,
filter_packages=[],
@ -669,7 +683,7 @@ class TestRunSolver(HelperMixin, helpers.PungiTestCase):
mock.call(
self.config2,
"x86_64",
[self._repo("repo")],
["/path/for/p1"],
[],
platform=None,
filter_packages=[],
@ -782,7 +796,7 @@ class TestRunSolver(HelperMixin, helpers.PungiTestCase):
mock.call(
self.config1,
"x86_64",
[self._repo("repo")],
["/path/for/p1"],
[],
platform=None,
filter_packages=[],
@ -790,7 +804,7 @@ class TestRunSolver(HelperMixin, helpers.PungiTestCase):
mock.call(
self.config2,
"x86_64",
[self._repo("repo")],
["/path/for/p1"],
[],
platform=None,
filter_packages=[],

148
tests/test_pkgset_source_koji.py
View File

@ -10,8 +10,6 @@ try:
except ImportError:
import unittest
from six.moves import cPickle as pickle
sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
from pungi.phases.pkgset.sources import source_koji
@ -84,96 +82,69 @@ class TestPopulateGlobalPkgset(helpers.PungiTestCase):
self.pkgset_path = os.path.join(self.topdir, 'work', 'global', 'pkgset_global.pickle')
self.koji_module_path = os.path.join(self.topdir, 'work', 'global', 'koji-module-Server.yaml')
@unittest.skip("TODO not working now")
@mock.patch('six.moves.cPickle.dumps')
@mock.patch("pungi.phases.pkgset.sources.source_koji.MaterializedPackageSet.create")
@mock.patch('pungi.phases.pkgset.pkgsets.KojiPackageSet')
def test_populate(self, KojiPackageSet, pickle_dumps):
pickle_dumps.return_value = b'DATA'
def test_populate(self, KojiPackageSet, materialize):
materialize.side_effect = self.mock_materialize
orig_pkgset = KojiPackageSet.return_value
pkgset = source_koji.populate_global_pkgset(
self.compose, self.koji_wrapper, '/prefix', 123456)
self.assertIs(pkgset, orig_pkgset)
self.assertEqual(
pkgset.mock_calls,
[
mock.call.populate(
'f25',
123456,
inherit=True,
logfile=self.topdir + '/logs/global/packages_from_f25.global.log',
include_packages=set(),
),
mock.call.save_file_list(
self.topdir + '/work/global/package_list/global.conf',
remove_path_prefix='/prefix',
),
mock.call.save_file_cache(
self.topdir + '/work/global/pkgset_file_cache.pickle'
),
]
pkgsets = source_koji.populate_global_pkgset(
self.compose, self.koji_wrapper, "/prefix", 123456
)
self.assertItemsEqual(pickle_dumps.call_args_list,
[mock.call(orig_pkgset, protocol=pickle.HIGHEST_PROTOCOL)])
with open(self.pkgset_path) as f:
self.assertEqual(f.read(), 'DATA')
@unittest.skip("TODO not working now")
@mock.patch('six.moves.cPickle.dumps')
self.assertEqual(len(pkgsets), 1)
self.assertIs(pkgsets[0], orig_pkgset)
pkgsets[0].assert_has_calls(
[mock.call.populate("f25", 123456, inherit=True, include_packages=set())],
)
def mock_materialize(self, compose, pkgset, prefix, mmd):
self.assertEqual(prefix, "/prefix")
self.assertEqual(compose, self.compose)
return pkgset
@mock.patch("pungi.phases.pkgset.sources.source_koji.MaterializedPackageSet.create")
@mock.patch('pungi.phases.pkgset.pkgsets.KojiPackageSet')
def test_populate_with_multiple_koji_tags(self, KojiPackageSet, pickle_dumps):
def test_populate_with_multiple_koji_tags(
self, KojiPackageSet, materialize
):
self.compose = helpers.DummyCompose(self.topdir, {
'pkgset_koji_tag': ['f25', 'f25-extra'],
'sigkeys': ["foo", "bar"],
})
pickle_dumps.return_value = b'DATA'
materialize.side_effect = self.mock_materialize
orig_pkgset = KojiPackageSet.return_value
pkgsets = source_koji.populate_global_pkgset(
self.compose, self.koji_wrapper, "/prefix", 123456
)
pkgset = source_koji.populate_global_pkgset(
self.compose, self.koji_wrapper, '/prefix', 123456)
self.assertEqual(len(pkgsets), 2)
init_calls = KojiPackageSet.call_args_list
self.assertItemsEqual([call[0][0] for call in init_calls], ["f25", "f25-extra"])
self.assertItemsEqual(
[call[0][1] for call in init_calls], [self.koji_wrapper] * 2
)
self.assertItemsEqual(
[call[0][2] for call in init_calls], [["foo", "bar"]] * 2
)
self.assertIs(pkgset, orig_pkgset)
pkgset.assert_has_calls(
pkgsets[0].assert_has_calls(
[mock.call.populate("f25", 123456, inherit=True, include_packages=set())]
)
pkgsets[1].assert_has_calls(
[
mock.call.populate(
'f25',
123456,
inherit=True,
logfile=self.topdir + '/logs/global/packages_from_f25.global.log',
include_packages=set(),
"f25-extra", 123456, inherit=True, include_packages=set()
),
]
)
pkgset.assert_has_calls(
[
mock.call.populate(
'f25-extra',
123456,
inherit=True,
logfile=self.topdir + '/logs/global/packages_from_f25-extra.global.log',
include_packages=set(),
),
]
)
pkgset.assert_has_calls([mock.call.save_file_list(self.topdir + '/work/global/package_list/global.conf',
remove_path_prefix='/prefix')])
# for each tag, call pkgset.fast_merge once for each variant and once for global pkgset
self.assertEqual(pkgset.fast_merge.call_count, 2 * (len(self.compose.all_variants.values()) + 1))
self.assertItemsEqual(pickle_dumps.call_args_list,
[mock.call(orig_pkgset, protocol=pickle.HIGHEST_PROTOCOL)])
with open(self.pkgset_path) as f:
self.assertEqual(f.read(), 'DATA')
@mock.patch('six.moves.cPickle.dumps')
@mock.patch("pungi.phases.pkgset.sources.source_koji.MaterializedPackageSet.create")
@mock.patch('pungi.phases.pkgset.pkgsets.KojiPackageSet.populate')
@mock.patch('pungi.phases.pkgset.pkgsets.KojiPackageSet.save_file_list')
def test_populate_packages_to_gather(self, save_file_list, popuplate,
pickle_dumps):
def test_populate_packages_to_gather(self, save_file_list, popuplate, materialize):
self.compose = helpers.DummyCompose(self.topdir, {
'gather_method': 'nodeps',
'pkgset_koji_tag': 'f25',
@ -182,7 +153,8 @@ class TestPopulateGlobalPkgset(helpers.PungiTestCase):
('.*', {'*': ['pkg', 'foo.x86_64']}),
]
})
pickle_dumps.return_value = b'DATA'
materialize.side_effect = self.mock_materialize
pkgsets = source_koji.populate_global_pkgset(
self.compose, self.koji_wrapper, '/prefix', 123456)
@ -201,43 +173,21 @@ class TestGetPackageSetFromKoji(helpers.PungiTestCase):
self.koji_wrapper.koji_proxy.getLastEvent.return_value = EVENT_INFO
self.koji_wrapper.koji_proxy.getTag.return_value = TAG_INFO
@unittest.skip("TODO not working now")
@mock.patch('pungi.phases.pkgset.common.create_arch_repos')
@mock.patch('pungi.phases.pkgset.sources.source_koji.populate_global_pkgset')
def test_get_package_sets(self, pgp, car):
expected = {"x86_64": mock.Mock(), "global": pgp.return_value}
def mock_create_arch_repos(compose, path_prefix, paths):
for arch in compose.get_arches():
paths[arch] = "/repo/for/" + arch
car.side_effect = mock_create_arch_repos
pkgsets = source_koji.get_pkgset_from_koji(self.compose, self.koji_wrapper, '/prefix')
def test_get_package_sets(self, pgp):
pkgsets = source_koji.get_pkgset_from_koji(
self.compose, self.koji_wrapper, "/prefix"
)
self.assertItemsEqual(
self.koji_wrapper.koji_proxy.mock_calls,
[mock.call.getLastEvent()]
)
self.assertEqual(pkgsets, pgp.return_value)
self.assertEqual(len(pkgsets), 1)
self.assertEqual(pgp.call_args_list,
[mock.call(self.compose, self.koji_wrapper, '/prefix',
EVENT_INFO)])
global_repo = os.path.join(self.topdir, "work/global/repo")
self.assertItemsEqual(
car.call_args_list,
[mock.call(self.compose, "/prefix", pkgsets[0].paths)],
)
self.assertEqual(pkgsets[0].package_sets, expected)
self.assertEqual(
pkgsets[0].paths,
{
"amd64": "/repo/for/amd64",
"global": global_repo,
"x86_64": "/repo/for/x86_64",
}
pgp.call_args_list,
[mock.call(self.compose, self.koji_wrapper, '/prefix', EVENT_INFO)],
)
def test_get_koji_modules(self):