b80efbfd97
Behavior before this change: debuginfo was added based on source RPMs. Pungi would get all debuginfo for all architectures that include at least one binary package. This had a consequence that if foo-x.x86_64 and foo-x.i686 from the same built were included, foo-y-debuginfo.i686 would be included despite foo-y only being present for x86_64. The patch changes this to work on binary package level: for each included package `x`, check if there is `x-debuginfo` or `x-debugsource`, and include them. Packages added in this way have to go through one iteration of the solver, to account for cases such as `x-libs-debuginfo` depending on `x-debuginfo` (with only `x` starting this chain). To make it slightly faster, the invocation of fus is changed to only process newly added package in each iteration. It should have no effect on the results, and subsequent iterations are much faster if they don't process the same stuff again and again. JIRA: COMPOSE-3247 Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
1026 lines
33 KiB
Python
1026 lines
33 KiB
Python
# -*- coding: utf-8 -*-
|
|
|
|
from collections import namedtuple
|
|
import copy
|
|
import mock
|
|
import os
|
|
import sys
|
|
|
|
sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
|
|
|
|
from pungi.phases.gather.methods import method_hybrid as hybrid
|
|
from tests import helpers
|
|
|
|
|
|
MockPkg = namedtuple(
|
|
"MockPkg", ["name", "version", "release", "epoch", "sourcerpm", "file_path", "arch"]
|
|
)
|
|
|
|
|
|
class NamedMock(mock.Mock):
|
|
def __init__(self, name=None, **kwargs):
|
|
super(NamedMock, self).__init__(**kwargs)
|
|
self.name = name
|
|
|
|
|
|
class TestMethodHybrid(helpers.PungiTestCase):
|
|
@mock.patch("pungi.phases.gather.methods.method_hybrid.CompsWrapper")
|
|
@mock.patch("pungi.phases.gather.get_lookaside_repos")
|
|
@mock.patch("pungi.phases.gather.methods.method_hybrid.expand_groups")
|
|
@mock.patch("pungi.phases.gather.methods.method_hybrid.expand_packages")
|
|
@mock.patch("pungi.phases.gather.methods.method_hybrid.create_module_repo")
|
|
def test_call_method(self, cmr, ep, eg, glr, CW):
|
|
compose = helpers.DummyCompose(self.topdir, {})
|
|
m = hybrid.GatherMethodHybrid(compose)
|
|
m.run_solver = mock.Mock(return_value=(mock.Mock(), mock.Mock()))
|
|
pkg = MockPkg(
|
|
name="pkg",
|
|
version="1",
|
|
release="2",
|
|
arch="x86_64",
|
|
epoch=3,
|
|
sourcerpm=None,
|
|
file_path=None,
|
|
)
|
|
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]})}
|
|
arch = "x86_64"
|
|
variant = compose.variants["Server"]
|
|
|
|
res = m(
|
|
arch,
|
|
variant,
|
|
package_sets,
|
|
set(["pkg"]),
|
|
["standard"],
|
|
prepopulate=["prep.noarch"],
|
|
)
|
|
|
|
self.assertEqual(res, ep.return_value)
|
|
self.assertEqual(cmr.call_args_list, [mock.call(compose, variant, arch)])
|
|
self.assertEqual(
|
|
m.run_solver.call_args_list,
|
|
[
|
|
mock.call(
|
|
variant,
|
|
arch,
|
|
set(["pkg", "foo", "bar", ("prep", "noarch")]),
|
|
cmr.return_value,
|
|
[],
|
|
)
|
|
],
|
|
)
|
|
self.assertEqual(
|
|
ep.call_args_list,
|
|
[
|
|
mock.call(
|
|
{"pkg-3:1-2.x86_64": pkg},
|
|
{},
|
|
glr.return_value,
|
|
m.run_solver.return_value[0],
|
|
filter_packages=[],
|
|
)
|
|
],
|
|
)
|
|
self.assertEqual(
|
|
eg.call_args_list,
|
|
[mock.call(compose, arch, variant, ["standard"], set_pkg_arch=False)],
|
|
)
|
|
self.assertEqual(
|
|
CW.mock_calls,
|
|
[
|
|
mock.call(
|
|
os.path.join(
|
|
self.topdir, "work/x86_64/comps/comps-Server.x86_64.xml"
|
|
)
|
|
),
|
|
mock.call().get_langpacks(),
|
|
],
|
|
)
|
|
|
|
@mock.patch("pungi.phases.gather.methods.method_hybrid.CompsWrapper")
|
|
def test_prepare_langpacks(self, CW):
|
|
compose = helpers.DummyCompose(self.topdir, {})
|
|
CW.return_value.get_langpacks.return_value = {"foo": "foo-%s"}
|
|
m = hybrid.GatherMethodHybrid(compose)
|
|
m.package_sets = {
|
|
"x86_64": mock.Mock(
|
|
rpms_by_arch={
|
|
"x86_64": [
|
|
MockPkg(
|
|
name="foo",
|
|
version="1",
|
|
release="2",
|
|
arch="x86_64",
|
|
epoch=0,
|
|
sourcerpm=None,
|
|
file_path=None,
|
|
),
|
|
MockPkg(
|
|
name="foo-en",
|
|
version="1",
|
|
release="2",
|
|
arch="x86_64",
|
|
epoch=0,
|
|
sourcerpm=None,
|
|
file_path=None,
|
|
),
|
|
MockPkg(
|
|
name="foo-devel",
|
|
version="1",
|
|
release="2",
|
|
arch="x86_64",
|
|
epoch=0,
|
|
sourcerpm=None,
|
|
file_path=None,
|
|
),
|
|
MockPkg(
|
|
name="foo-debuginfo",
|
|
version="1",
|
|
release="2",
|
|
arch="x86_64",
|
|
epoch=0,
|
|
sourcerpm=None,
|
|
file_path=None,
|
|
),
|
|
]
|
|
}
|
|
)
|
|
}
|
|
m.prepare_langpacks("x86_64", compose.variants["Server"])
|
|
|
|
self.assertEqual(m.langpacks, {"foo": set(["foo-en"])})
|
|
|
|
def test_expand_list(self):
|
|
compose = helpers.DummyCompose(self.topdir, {})
|
|
m = hybrid.GatherMethodHybrid(compose)
|
|
m.arch = "x86_64"
|
|
m.package_sets = {
|
|
"x86_64": mock.Mock(
|
|
rpms_by_arch={
|
|
"x86_64": [
|
|
MockPkg(
|
|
name="foo",
|
|
version="1",
|
|
release="2",
|
|
arch="x86_64",
|
|
epoch=0,
|
|
sourcerpm=None,
|
|
file_path=None,
|
|
),
|
|
MockPkg(
|
|
name="foo-en",
|
|
version="1",
|
|
release="2",
|
|
arch="x86_64",
|
|
epoch=0,
|
|
sourcerpm=None,
|
|
file_path=None,
|
|
),
|
|
MockPkg(
|
|
name="bar",
|
|
version="1",
|
|
release="2",
|
|
arch="x86_64",
|
|
epoch=0,
|
|
sourcerpm=None,
|
|
file_path=None,
|
|
),
|
|
]
|
|
}
|
|
)
|
|
}
|
|
expanded = m.expand_list(["foo*"])
|
|
|
|
self.assertItemsEqual([p.name for p in expanded], ["foo", "foo-en"])
|
|
|
|
|
|
class MockModule(object):
|
|
def __init__(
|
|
self, name, platform=None, stream=None, version=None, context=None, rpms=None
|
|
):
|
|
self.name = name
|
|
self.platform = platform
|
|
self.stream = stream
|
|
self.version = version
|
|
self.context = context
|
|
self.rpms = rpms or ["pkg-1.0-1.x86_64"]
|
|
|
|
def get_name(self):
|
|
return self.name
|
|
|
|
def peek_name(self):
|
|
return self.name
|
|
|
|
def peek_stream(self):
|
|
return self.stream
|
|
|
|
def peek_version(self):
|
|
return self.version
|
|
|
|
def peek_context(self):
|
|
return self.context
|
|
|
|
def peek_dependencies(self):
|
|
return [
|
|
mock.Mock(
|
|
peek_requires=mock.Mock(
|
|
return_value={
|
|
"platform": mock.Mock(
|
|
dup=mock.Mock(return_value=[self.platform])
|
|
)
|
|
}
|
|
)
|
|
)
|
|
]
|
|
|
|
def copy(self):
|
|
return self
|
|
|
|
def set_arch(self, arch):
|
|
pass
|
|
|
|
def get_rpm_artifacts(self):
|
|
return mock.Mock(dup=mock.Mock(return_value=self.rpms))
|
|
|
|
|
|
class HelperMixin(object):
|
|
def _repo(self, name):
|
|
return os.path.join(self.compose.topdir, "work/x86_64/%s" % name)
|
|
|
|
|
|
@mock.patch("pungi.phases.gather.methods.method_hybrid.add_modular_metadata")
|
|
@mock.patch("pungi.phases.gather.methods.method_hybrid.run")
|
|
class TestCreateModuleRepo(HelperMixin, helpers.PungiTestCase):
|
|
def setUp(self):
|
|
super(TestCreateModuleRepo, self).setUp()
|
|
self.compose = helpers.DummyCompose(self.topdir, {})
|
|
self.variant = self.compose.variants["Server"]
|
|
|
|
def test_no_modules(self, run, Modulemd):
|
|
plat = hybrid.create_module_repo(self.compose, self.variant, "x86_64")
|
|
|
|
self.assertIsNone(plat)
|
|
self.assertEqual(run.call_args_list, [])
|
|
self.assertEqual(Modulemd.mock_calls, [])
|
|
|
|
def test_more_than_one_platform(self, run, add_modular_metadata):
|
|
self.variant.arch_mmds["x86_64"] = {
|
|
"mod:1": MockModule("mod", platform="f29"),
|
|
"mod:2": MockModule("mod", platform="f30"),
|
|
}
|
|
|
|
with self.assertRaises(RuntimeError) as ctx:
|
|
hybrid.create_module_repo(self.compose, self.variant, "x86_64")
|
|
|
|
self.assertIn("conflicting requests for platform", str(ctx.exception))
|
|
self.assertEqual(run.call_args_list, [])
|
|
self.assertEqual(add_modular_metadata.mock_calls, [])
|
|
|
|
@mock.patch("pungi.phases.gather.methods.method_hybrid.iter_module_defaults")
|
|
def test_creating_repo_with_module_and_default(self, imd, run, add_modular_metadata):
|
|
mod = MockModule("mod", platform="f29")
|
|
self.variant.arch_mmds["x86_64"] = {"mod:1": mod}
|
|
default = mock.Mock(peek_module_name=mock.Mock(return_value="mod"))
|
|
imd.return_value = [default]
|
|
|
|
plat = hybrid.create_module_repo(self.compose, self.variant, "x86_64")
|
|
|
|
self.assertEqual(plat, "f29")
|
|
|
|
self.assertEqual(
|
|
add_modular_metadata.call_args_list,
|
|
[
|
|
mock.call(
|
|
mock.ANY,
|
|
self._repo("module_repo_Server"),
|
|
[mod, default],
|
|
mock.ANY,
|
|
),
|
|
],
|
|
)
|
|
self.assertEqual(
|
|
# Get first positional argument of the first call, and since it's
|
|
# an array, take first two elements.
|
|
run.call_args_list[0][0][0][:2],
|
|
["createrepo_c", self._repo("module_repo_Server")]
|
|
)
|
|
|
|
|
|
class ModifiedMagicMock(mock.MagicMock):
|
|
"""Like MagicMock, but remembers original values or mutable arguments."""
|
|
|
|
def _mock_call(_mock_self, *args, **kwargs):
|
|
return super(ModifiedMagicMock, _mock_self)._mock_call(
|
|
*copy.deepcopy(args), **copy.deepcopy(kwargs)
|
|
)
|
|
|
|
|
|
@mock.patch("pungi.wrappers.fus.write_config")
|
|
@mock.patch("pungi.wrappers.fus.parse_output")
|
|
@mock.patch("pungi.wrappers.fus.get_cmd", new_callable=ModifiedMagicMock)
|
|
@mock.patch("pungi.phases.gather.methods.method_hybrid.run")
|
|
class TestRunSolver(HelperMixin, helpers.PungiTestCase):
|
|
def setUp(self):
|
|
super(TestRunSolver, self).setUp()
|
|
self.compose = helpers.DummyCompose(self.topdir, {})
|
|
self.phase = hybrid.GatherMethodHybrid(self.compose)
|
|
self.phase.multilib_methods = []
|
|
self.phase.arch = "x86_64"
|
|
self.logfile1 = os.path.join(
|
|
self.compose.topdir, "logs/x86_64/hybrid-depsolver-Server-iter-1.x86_64.log"
|
|
)
|
|
self.logfile2 = os.path.join(
|
|
self.compose.topdir, "logs/x86_64/hybrid-depsolver-Server-iter-2.x86_64.log"
|
|
)
|
|
self.config1 = os.path.join(
|
|
self.compose.topdir, "work/x86_64/fus/Server-solvables-1.x86_64.conf"
|
|
)
|
|
self.config2 = os.path.join(
|
|
self.compose.topdir, "work/x86_64/fus/Server-solvables-2.x86_64.conf"
|
|
)
|
|
|
|
def test_with_modules(self, run, gc, po, wc):
|
|
self.compose.has_comps = False
|
|
self.compose.variants["Server"].arch_mmds["x86_64"] = {
|
|
"mod:master": mock.Mock(
|
|
peek_name=mock.Mock(return_value="mod"),
|
|
peek_stream=mock.Mock(return_value="master"),
|
|
peek_version=mock.Mock(return_value="ver"),
|
|
peek_context=mock.Mock(return_value="ctx"),
|
|
)
|
|
}
|
|
self.compose.variants["Server"].mmds = [
|
|
mock.Mock(
|
|
peek_name=mock.Mock(return_value="mod"),
|
|
peek_stream=mock.Mock(return_value="master"),
|
|
peek_version=mock.Mock(return_value="ver"),
|
|
peek_context=mock.Mock(return_value="ctx"),
|
|
)
|
|
]
|
|
po.return_value = ([], ["m1"])
|
|
|
|
res = self.phase.run_solver(
|
|
self.compose.variants["Server"],
|
|
"x86_64",
|
|
[],
|
|
platform="pl",
|
|
filter_packages=[("foo", None)],
|
|
)
|
|
|
|
self.assertItemsEqual(res[0], [])
|
|
self.assertItemsEqual(res[1], ["m1"])
|
|
self.assertEqual(po.call_args_list, [mock.call(self.logfile1)])
|
|
self.assertEqual(
|
|
run.call_args_list,
|
|
[
|
|
mock.call(
|
|
gc.return_value, logfile=self.logfile1, show_cmd=True, env=mock.ANY
|
|
)
|
|
],
|
|
)
|
|
self.assertEqual(
|
|
wc.call_args_list, [mock.call(self.config1, ["mod:master"], [])],
|
|
)
|
|
self.assertEqual(
|
|
gc.call_args_list,
|
|
[
|
|
mock.call(
|
|
self.config1,
|
|
"x86_64",
|
|
[self._repo("repo"), self._repo("module_repo_Server")],
|
|
[],
|
|
platform="pl",
|
|
filter_packages=[("foo", None)],
|
|
)
|
|
],
|
|
)
|
|
|
|
def test_with_modules_with_devel(self, run, gc, po, wc):
|
|
self.compose.has_comps = False
|
|
self.compose.variants["Server"].arch_mmds["x86_64"] = {
|
|
"mod:master": mock.Mock(
|
|
peek_name=mock.Mock(return_value="mod"),
|
|
peek_stream=mock.Mock(return_value="master"),
|
|
peek_version=mock.Mock(return_value="ver"),
|
|
peek_context=mock.Mock(return_value="ctx"),
|
|
),
|
|
"mod-devel:master": mock.Mock(
|
|
peek_name=mock.Mock(return_value="mod-devel"),
|
|
peek_stream=mock.Mock(return_value="master"),
|
|
peek_version=mock.Mock(return_value="ver"),
|
|
peek_context=mock.Mock(return_value="ctx"),
|
|
),
|
|
}
|
|
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"],
|
|
"x86_64",
|
|
[],
|
|
platform="pl",
|
|
filter_packages=["foo"],
|
|
)
|
|
|
|
self.assertEqual(res, (set([("p-1-1", "x86_64", frozenset())]), set(["m1"])))
|
|
self.assertEqual(po.call_args_list, [mock.call(self.logfile1)])
|
|
self.assertEqual(
|
|
run.call_args_list,
|
|
[
|
|
mock.call(
|
|
gc.return_value, logfile=self.logfile1, show_cmd=True, env=mock.ANY
|
|
)
|
|
],
|
|
)
|
|
self.assertEqual(
|
|
wc.call_args_list,
|
|
[mock.call(self.config1, ["mod-devel:master", "mod:master"], [])],
|
|
)
|
|
self.assertEqual(
|
|
gc.call_args_list,
|
|
[
|
|
mock.call(
|
|
self.config1,
|
|
"x86_64",
|
|
[self._repo("repo"), self._repo("module_repo_Server")],
|
|
[],
|
|
platform="pl",
|
|
filter_packages=["foo"],
|
|
)
|
|
],
|
|
)
|
|
|
|
def test_with_comps(self, run, gc, po, wc):
|
|
self.phase.packages = {"pkg-1.0-1.x86_64": mock.Mock()}
|
|
self.phase.debuginfo = {"x86_64": {}}
|
|
po.return_value = ([("pkg-1.0-1", "x86_64", frozenset())], [])
|
|
res = self.phase.run_solver(
|
|
self.compose.variants["Server"],
|
|
"x86_64",
|
|
[("pkg", None)],
|
|
platform=None,
|
|
filter_packages=[],
|
|
)
|
|
|
|
self.assertItemsEqual(res[0], po.return_value[0])
|
|
self.assertItemsEqual(res[1], [])
|
|
self.assertEqual(po.call_args_list, [mock.call(self.logfile1)])
|
|
self.assertEqual(
|
|
run.call_args_list,
|
|
[
|
|
mock.call(
|
|
gc.return_value, logfile=self.logfile1, show_cmd=True, env=mock.ANY
|
|
)
|
|
],
|
|
)
|
|
self.assertEqual(
|
|
wc.call_args_list, [mock.call(self.config1, [], ["pkg"])],
|
|
)
|
|
self.assertEqual(
|
|
gc.call_args_list,
|
|
[
|
|
mock.call(
|
|
self.config1,
|
|
"x86_64",
|
|
[self._repo("repo")],
|
|
[],
|
|
platform=None,
|
|
filter_packages=[],
|
|
)
|
|
],
|
|
)
|
|
|
|
def test_with_comps_with_debuginfo(self, run, gc, po, wc):
|
|
dbg1 = NamedMock(name="pkg-debuginfo", arch="x86_64", sourcerpm="pkg.src.rpm")
|
|
dbg2 = NamedMock(name="pkg-debuginfo", arch="x86_64", sourcerpm="x.src.rpm")
|
|
self.phase.packages = {
|
|
"pkg-1.0-1.x86_64": NamedMock(
|
|
name="pkg", arch="x86_64", rpm_sourcerpm="pkg.src.rpm"
|
|
),
|
|
"pkg-debuginfo-1.0-1.x86_64": dbg1,
|
|
"pkg-debuginfo-1.0-2.x86_64": dbg2,
|
|
}
|
|
self.phase.debuginfo = {
|
|
"x86_64": {
|
|
"pkg-debuginfo": [dbg1, dbg2],
|
|
},
|
|
}
|
|
po.side_effect = [
|
|
([("pkg-1.0-1", "x86_64", frozenset())], []),
|
|
([("pkg-debuginfo-1.0-1", "x86_64", frozenset())], []),
|
|
]
|
|
res = self.phase.run_solver(
|
|
self.compose.variants["Server"],
|
|
"x86_64",
|
|
[("pkg", None)],
|
|
platform=None,
|
|
filter_packages=[],
|
|
)
|
|
|
|
self.assertItemsEqual(
|
|
res[0],
|
|
[
|
|
("pkg-1.0-1", "x86_64", frozenset()),
|
|
("pkg-debuginfo-1.0-1", "x86_64", frozenset()),
|
|
],
|
|
)
|
|
self.assertItemsEqual(res[1], [])
|
|
self.assertEqual(
|
|
po.call_args_list, [mock.call(self.logfile1), mock.call(self.logfile2)]
|
|
)
|
|
self.assertEqual(
|
|
run.call_args_list,
|
|
[
|
|
mock.call(
|
|
gc.return_value, logfile=self.logfile1, show_cmd=True, env=mock.ANY
|
|
),
|
|
mock.call(
|
|
gc.return_value, logfile=self.logfile2, show_cmd=True, env=mock.ANY
|
|
),
|
|
],
|
|
)
|
|
self.assertEqual(
|
|
wc.call_args_list,
|
|
[
|
|
mock.call(self.config1, [], ["pkg"]),
|
|
mock.call(self.config2, [], ["pkg-debuginfo.x86_64"]),
|
|
],
|
|
)
|
|
self.assertEqual(
|
|
gc.call_args_list,
|
|
[
|
|
mock.call(
|
|
self.config1,
|
|
"x86_64",
|
|
[self._repo("repo")],
|
|
[],
|
|
platform=None,
|
|
filter_packages=[],
|
|
),
|
|
mock.call(
|
|
self.config2,
|
|
"x86_64",
|
|
[self._repo("repo")],
|
|
[],
|
|
platform=None,
|
|
filter_packages=[],
|
|
),
|
|
],
|
|
)
|
|
|
|
def test_with_langpacks(self, run, gc, po, wc):
|
|
self.phase.langpacks = {"pkg": set(["pkg-en"])}
|
|
final = [
|
|
("pkg-1.0-1", "x86_64", frozenset()),
|
|
("pkg-en-1.0-1", "noarch", frozenset()),
|
|
]
|
|
po.side_effect = [([("pkg-1.0-1", "x86_64", frozenset())], []), (final, [])]
|
|
self.phase.packages = {
|
|
"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"],
|
|
"x86_64",
|
|
[("pkg", None)],
|
|
platform=None,
|
|
filter_packages=["foo"],
|
|
)
|
|
|
|
self.assertItemsEqual(res[0], final)
|
|
self.assertItemsEqual(res[1], [])
|
|
self.assertEqual(
|
|
po.call_args_list, [mock.call(self.logfile1), mock.call(self.logfile2)]
|
|
)
|
|
self.assertEqual(
|
|
run.call_args_list,
|
|
[
|
|
mock.call(
|
|
gc.return_value, logfile=self.logfile1, show_cmd=True, env=mock.ANY
|
|
),
|
|
mock.call(
|
|
gc.return_value, logfile=self.logfile2, show_cmd=True, env=mock.ANY
|
|
),
|
|
],
|
|
)
|
|
self.assertEqual(
|
|
wc.call_args_list,
|
|
[
|
|
mock.call(self.config1, [], ["pkg"]),
|
|
mock.call(self.config2, [], ["pkg-en"]),
|
|
],
|
|
)
|
|
self.assertEqual(
|
|
gc.call_args_list,
|
|
[
|
|
mock.call(
|
|
self.config1,
|
|
"x86_64",
|
|
[self._repo("repo")],
|
|
[],
|
|
platform=None,
|
|
filter_packages=["foo"],
|
|
),
|
|
mock.call(
|
|
self.config2,
|
|
"x86_64",
|
|
[self._repo("repo")],
|
|
[],
|
|
platform=None,
|
|
filter_packages=["foo"],
|
|
),
|
|
],
|
|
)
|
|
|
|
@mock.patch("pungi.phases.gather.methods.method_hybrid.cr")
|
|
def test_multilib_devel(self, cr, run, gc, po, wc):
|
|
self.phase.arch = "x86_64"
|
|
self.phase.multilib_methods = ["devel"]
|
|
self.phase.multilib = mock.Mock()
|
|
self.phase.multilib.is_multilib.side_effect = (
|
|
lambda pkg: pkg.name == "pkg-devel"
|
|
)
|
|
self.phase.valid_arches = ["x86_64", "i686", "noarch"]
|
|
cr.Metadata.return_value.keys.return_value = []
|
|
self.phase.package_maps = {
|
|
"x86_64": {
|
|
"pkg-devel-1.0-1.x86_64": NamedMock(name="pkg-devel"),
|
|
"pkg-devel-1.0-1.i686": NamedMock(name="pkg-devel"),
|
|
"foo-1.0-1.x86_64": NamedMock(name="foo"),
|
|
}
|
|
}
|
|
self.phase.packages = self.phase.package_maps["x86_64"]
|
|
self.phase.debuginfo = {"x86_64": {}}
|
|
po.side_effect = [
|
|
(
|
|
[
|
|
("pkg-devel-1.0-1", "x86_64", frozenset()),
|
|
("foo-1.0-1", "x86_64", frozenset())
|
|
],
|
|
frozenset()),
|
|
(
|
|
[
|
|
("pkg-devel-1.0-1", "i686", frozenset()),
|
|
],
|
|
[],
|
|
),
|
|
]
|
|
|
|
res = self.phase.run_solver(
|
|
self.compose.variants["Server"],
|
|
"x86_64",
|
|
[("pkg-devel", None), ("foo", None)],
|
|
platform=None,
|
|
filter_packages=[],
|
|
)
|
|
|
|
self.assertItemsEqual(
|
|
res[0],
|
|
[
|
|
("pkg-devel-1.0-1", "x86_64", frozenset()),
|
|
("foo-1.0-1", "x86_64", frozenset()),
|
|
("pkg-devel-1.0-1", "i686", frozenset()),
|
|
]
|
|
)
|
|
self.assertItemsEqual(res[1], [])
|
|
self.assertEqual(
|
|
po.call_args_list, [mock.call(self.logfile1), mock.call(self.logfile2)]
|
|
)
|
|
self.assertEqual(
|
|
run.call_args_list,
|
|
[
|
|
mock.call(
|
|
gc.return_value, logfile=self.logfile1, show_cmd=True, env=mock.ANY
|
|
),
|
|
mock.call(
|
|
gc.return_value, logfile=self.logfile2, show_cmd=True, env=mock.ANY
|
|
),
|
|
],
|
|
)
|
|
self.assertEqual(
|
|
wc.call_args_list,
|
|
[
|
|
mock.call(self.config1, [], ["foo", "pkg-devel"]),
|
|
mock.call(self.config2, [], ["pkg-devel.i686"]),
|
|
],
|
|
)
|
|
self.assertEqual(
|
|
gc.call_args_list,
|
|
[
|
|
mock.call(
|
|
self.config1,
|
|
"x86_64",
|
|
[self._repo("repo")],
|
|
[],
|
|
platform=None,
|
|
filter_packages=[],
|
|
),
|
|
mock.call(
|
|
self.config2,
|
|
"x86_64",
|
|
[self._repo("repo")],
|
|
[],
|
|
platform=None,
|
|
filter_packages=[],
|
|
),
|
|
],
|
|
)
|
|
|
|
@mock.patch("pungi.phases.gather.methods.method_hybrid.cr")
|
|
def test_multilib_runtime(self, cr, run, gc, po, wc):
|
|
packages = {
|
|
"abc": NamedMock(
|
|
name="foo",
|
|
epoch=None,
|
|
version="1.0",
|
|
release="1",
|
|
arch="x86_64",
|
|
provides=[("/usr/lib/libfoo.1.so.1", None, None)],
|
|
),
|
|
"def": NamedMock(
|
|
name="foo",
|
|
epoch=None,
|
|
version="1.0",
|
|
release="1",
|
|
arch="i686",
|
|
provides=[("/usr/lib/libfoo.1.so.1", None, None)],
|
|
),
|
|
"ghi": NamedMock(
|
|
name="pkg-devel",
|
|
epoch=None,
|
|
version="1.0",
|
|
release="1",
|
|
arch="x86_64",
|
|
provides=[],
|
|
),
|
|
}
|
|
cr.Metadata.return_value.keys.return_value = packages.keys()
|
|
cr.Metadata.return_value.get.side_effect = lambda key: packages[key]
|
|
|
|
self.phase.multilib_methods = ["runtime"]
|
|
self.phase.multilib = mock.Mock()
|
|
self.phase.multilib.is_multilib.side_effect = lambda pkg: pkg.name == "foo"
|
|
self.phase.valid_arches = ["x86_64", "i686", "noarch"]
|
|
self.phase.arch = "x86_64"
|
|
self.phase.package_maps = {
|
|
"x86_64": {
|
|
"pkg-devel-1.0-1.x86_64": mock.Mock(),
|
|
"pkg-devel-1.0-1.i686": mock.Mock(),
|
|
"foo-1.0-1.x86_64": mock.Mock(),
|
|
"foo-1.0-1.i686": mock.Mock(),
|
|
}
|
|
}
|
|
self.phase.debuginfo = {"x86_64": {}}
|
|
po.side_effect = [
|
|
(
|
|
[
|
|
("pkg-devel-1.0-1", "x86_64", frozenset()),
|
|
("foo-1.0-1", "x86_64", frozenset())
|
|
],
|
|
[],
|
|
),
|
|
(
|
|
[
|
|
("foo-1.0-1", "i686", frozenset()),
|
|
],
|
|
[],
|
|
),
|
|
]
|
|
|
|
res = self.phase.run_solver(
|
|
self.compose.variants["Server"],
|
|
"x86_64",
|
|
[("pkg-devel", None), ("foo", None)],
|
|
platform=None,
|
|
filter_packages=[],
|
|
)
|
|
|
|
self.assertItemsEqual(
|
|
res[0],
|
|
[
|
|
("pkg-devel-1.0-1", "x86_64", frozenset()),
|
|
("foo-1.0-1", "x86_64", frozenset()),
|
|
("foo-1.0-1", "i686", frozenset()),
|
|
],
|
|
)
|
|
self.assertItemsEqual(res[1], [])
|
|
self.assertEqual(
|
|
po.call_args_list, [mock.call(self.logfile1), mock.call(self.logfile2)]
|
|
)
|
|
self.assertEqual(
|
|
run.call_args_list,
|
|
[
|
|
mock.call(
|
|
gc.return_value, logfile=self.logfile1, show_cmd=True, env=mock.ANY
|
|
),
|
|
mock.call(
|
|
gc.return_value, logfile=self.logfile2, show_cmd=True, env=mock.ANY
|
|
),
|
|
],
|
|
)
|
|
self.assertEqual(
|
|
wc.call_args_list,
|
|
[
|
|
mock.call(self.config1, [], ["foo", "pkg-devel"]),
|
|
mock.call(self.config2, [], ["foo.i686"]),
|
|
],
|
|
)
|
|
self.assertEqual(
|
|
gc.call_args_list,
|
|
[
|
|
mock.call(
|
|
self.config1,
|
|
"x86_64",
|
|
[self._repo("repo")],
|
|
[],
|
|
platform=None,
|
|
filter_packages=[],
|
|
),
|
|
mock.call(
|
|
self.config2,
|
|
"x86_64",
|
|
[self._repo("repo")],
|
|
[],
|
|
platform=None,
|
|
filter_packages=[],
|
|
),
|
|
],
|
|
)
|
|
|
|
|
|
class TestExpandPackages(helpers.PungiTestCase):
|
|
def _mk_packages(self, src=None, debug_arch=None):
|
|
pkg = MockPkg(
|
|
name="pkg",
|
|
version="1",
|
|
release="2",
|
|
arch="x86_64",
|
|
epoch=3,
|
|
sourcerpm="pkg-1-2.src",
|
|
file_path="/tmp/pkg.rpm",
|
|
)
|
|
nevra_to_pkg = {"pkg-3:1-2.x86_64": pkg}
|
|
if src or debug_arch:
|
|
nevra_to_pkg["pkg-3:1-2.src"] = pkg._replace(
|
|
name="pkg", arch="src", file_path="/tmp/pkg.src.rpm"
|
|
)
|
|
if debug_arch:
|
|
nevra_to_pkg["pkg-debuginfo-3:1-2.%s" % debug_arch] = pkg._replace(
|
|
name="pkg-debuginfo",
|
|
arch=debug_arch,
|
|
file_path="/tmp/pkg-debuginfo.%s.rpm" % debug_arch
|
|
)
|
|
return nevra_to_pkg
|
|
|
|
def test_single_package(self):
|
|
nevra_to_pkg = self._mk_packages()
|
|
|
|
res = hybrid.expand_packages(
|
|
nevra_to_pkg, {}, [], [("pkg-3:1-2", "x86_64", [])], []
|
|
)
|
|
|
|
self.assertEqual(
|
|
res,
|
|
{
|
|
"rpm": [{"path": "/tmp/pkg.rpm", "flags": []}],
|
|
"srpm": [],
|
|
"debuginfo": [],
|
|
},
|
|
)
|
|
|
|
def test_include_src(self):
|
|
nevra_to_pkg = self._mk_packages(src=True)
|
|
|
|
res = hybrid.expand_packages(
|
|
nevra_to_pkg, {}, [], [("pkg-3:1-2", "x86_64", [])], []
|
|
)
|
|
|
|
self.assertEqual(
|
|
res,
|
|
{
|
|
"rpm": [{"path": "/tmp/pkg.rpm", "flags": []}],
|
|
"srpm": [{"path": "/tmp/pkg.src.rpm", "flags": []}],
|
|
"debuginfo": [],
|
|
},
|
|
)
|
|
|
|
def test_filter_src(self):
|
|
nevra_to_pkg = self._mk_packages(src=True)
|
|
|
|
res = hybrid.expand_packages(
|
|
nevra_to_pkg,
|
|
{},
|
|
[],
|
|
[("pkg-3:1-2", "x86_64", [])],
|
|
filter_packages=[("pkg", "src")],
|
|
)
|
|
|
|
self.assertEqual(
|
|
res,
|
|
{
|
|
"rpm": [{"path": "/tmp/pkg.rpm", "flags": []}],
|
|
"srpm": [],
|
|
"debuginfo": [],
|
|
},
|
|
)
|
|
|
|
def test_modular_include_src(self):
|
|
nevra_to_pkg = self._mk_packages(src=True)
|
|
|
|
res = hybrid.expand_packages(
|
|
nevra_to_pkg, {}, [], [("pkg-3:1-2", "x86_64", ["modular"])], []
|
|
)
|
|
|
|
self.assertEqual(
|
|
res,
|
|
{
|
|
"rpm": [{"path": "/tmp/pkg.rpm", "flags": []}],
|
|
"srpm": [{"path": "/tmp/pkg.src.rpm", "flags": []}],
|
|
"debuginfo": [],
|
|
},
|
|
)
|
|
|
|
def test_modular_debug_in_correct_place(self):
|
|
nevra_to_pkg = self._mk_packages(debug_arch="x86_64")
|
|
|
|
res = hybrid.expand_packages(
|
|
nevra_to_pkg, {}, [], [("pkg-debuginfo-3:1-2", "x86_64", ["modular"])], []
|
|
)
|
|
|
|
self.assertEqual(
|
|
res,
|
|
{
|
|
"rpm": [],
|
|
"srpm": [{"path": "/tmp/pkg.src.rpm", "flags": []}],
|
|
"debuginfo": [{"path": "/tmp/pkg-debuginfo.x86_64.rpm", "flags": []}],
|
|
},
|
|
)
|
|
|
|
@mock.patch("pungi.phases.gather.methods.method_hybrid.cr")
|
|
def test_skip_lookaside_source(self, cr):
|
|
nevra_to_pkg = self._mk_packages(src=True)
|
|
lookasides = [mock.Mock()]
|
|
repo = {
|
|
"abc": NamedMock(
|
|
name="pkg",
|
|
arch="src",
|
|
location_base="file:///tmp/",
|
|
location_href="pkg.src.rpm",
|
|
),
|
|
}
|
|
cr.Metadata.return_value.keys.return_value = repo.keys()
|
|
cr.Metadata.return_value.get.side_effect = lambda key: repo[key]
|
|
|
|
res = hybrid.expand_packages(
|
|
nevra_to_pkg, {}, lookasides, [("pkg-3:1-2", "x86_64", [])], []
|
|
)
|
|
|
|
self.assertEqual(
|
|
res,
|
|
{
|
|
"rpm": [{"path": "/tmp/pkg.rpm", "flags": []}],
|
|
"srpm": [],
|
|
"debuginfo": [],
|
|
},
|
|
)
|
|
|
|
@mock.patch("pungi.phases.gather.methods.method_hybrid.cr")
|
|
def test_skip_lookaside_packages(self, cr):
|
|
nevra_to_pkg = self._mk_packages(debug_arch="x86_64")
|
|
lookasides = [mock.Mock()]
|
|
repo = {
|
|
"abc": NamedMock(
|
|
name="pkg",
|
|
arch="x86_64",
|
|
location_base="file:///tmp/",
|
|
location_href="pkg.rpm",
|
|
)
|
|
}
|
|
cr.Metadata.return_value.keys.return_value = repo.keys()
|
|
cr.Metadata.return_value.get.side_effect = lambda key: repo[key]
|
|
|
|
res = hybrid.expand_packages(
|
|
nevra_to_pkg, {}, lookasides, [("pkg-3:1-2", "x86_64", [])], []
|
|
)
|
|
|
|
self.assertEqual(res, {"rpm": [], "srpm": [], "debuginfo": []})
|
|
|
|
|
|
class TestFilterModules(helpers.PungiTestCase):
|
|
def test_remove_one(self):
|
|
self.compose = helpers.DummyCompose(self.topdir, {})
|
|
self.variant = self.compose.variants["Server"]
|
|
self.variant.arch_mmds["x86_64"] = {
|
|
"mod:1": MockModule("mod", platform="f29"),
|
|
"mod:2": MockModule("mod", platform="f30"),
|
|
}
|
|
|
|
hybrid.filter_modules(self.variant, "x86_64", ["mod:1"])
|
|
|
|
self.assertItemsEqual(self.variant.arch_mmds["x86_64"].keys(), ["mod:1"])
|