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

gather: Remove unused argument 

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2019-07-03 13:53:26 +02:00
parent da78b99fc0
commit eeec62756f
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -210,7 +210,6 @@ class GatherMethodHybrid(pungi.phases.gather.method.GatherMethodBase):
filter_modules(variant, arch, out_modules) filter_modules(variant, arch, out_modules)
return expand_packages( return expand_packages(
self._get_pkg_map(arch), self._get_pkg_map(arch),
variant.arch_mmds.get(arch, {}),
pungi.phases.gather.get_lookaside_repos(self.compose, arch, variant), pungi.phases.gather.get_lookaside_repos(self.compose, arch, variant),
nvrs, nvrs,
filter_packages=filter_packages, filter_packages=filter_packages,
@ -443,7 +442,7 @@ def _make_result(paths):
return [{"path": path, "flags": []} for path in sorted(paths)] return [{"path": path, "flags": []} for path in sorted(paths)]
def expand_packages(nevra_to_pkg, variant_modules, lookasides, nvrs, filter_packages): def expand_packages(nevra_to_pkg, lookasides, nvrs, filter_packages):
"""For each package add source RPM.""" """For each package add source RPM."""
# This will serve as the final result. We collect sets of paths to the # This will serve as the final result. We collect sets of paths to the
# packages. # packages.

14
tests/test_gather_method_hybrid.py
View File

@ -76,7 +76,6 @@ class TestMethodHybrid(helpers.PungiTestCase):
[ [
mock.call( mock.call(
{"pkg-3:1-2.x86_64": pkg}, {"pkg-3:1-2.x86_64": pkg},
{},
glr.return_value, glr.return_value,
m.run_solver.return_value[0], m.run_solver.return_value[0],
filter_packages=[], filter_packages=[],
@ -837,7 +836,7 @@ class TestExpandPackages(helpers.PungiTestCase):
nevra_to_pkg = self._mk_packages() nevra_to_pkg = self._mk_packages()
res = hybrid.expand_packages( res = hybrid.expand_packages(
nevra_to_pkg, {}, [], [("pkg-3:1-2", "x86_64", [])], [] nevra_to_pkg, [], [("pkg-3:1-2", "x86_64", [])], []
) )
self.assertEqual( self.assertEqual(
@ -853,7 +852,7 @@ class TestExpandPackages(helpers.PungiTestCase):
nevra_to_pkg = self._mk_packages(src=True) nevra_to_pkg = self._mk_packages(src=True)
res = hybrid.expand_packages( res = hybrid.expand_packages(
nevra_to_pkg, {}, [], [("pkg-3:1-2", "x86_64", [])], [] nevra_to_pkg, [], [("pkg-3:1-2", "x86_64", [])], []
) )
self.assertEqual( self.assertEqual(
@ -870,7 +869,6 @@ class TestExpandPackages(helpers.PungiTestCase):
res = hybrid.expand_packages( res = hybrid.expand_packages(
nevra_to_pkg, nevra_to_pkg,
{},
[], [],
[("pkg-3:1-2", "x86_64", [])], [("pkg-3:1-2", "x86_64", [])],
filter_packages=[("pkg", "src")], filter_packages=[("pkg", "src")],
@ -889,7 +887,7 @@ class TestExpandPackages(helpers.PungiTestCase):
nevra_to_pkg = self._mk_packages(src=True) nevra_to_pkg = self._mk_packages(src=True)
res = hybrid.expand_packages( res = hybrid.expand_packages(
nevra_to_pkg, {}, [], [("pkg-3:1-2", "x86_64", ["modular"])], [] nevra_to_pkg, [], [("pkg-3:1-2", "x86_64", ["modular"])], []
) )
self.assertEqual( self.assertEqual(
@ -905,7 +903,7 @@ class TestExpandPackages(helpers.PungiTestCase):
nevra_to_pkg = self._mk_packages(debug_arch="x86_64") nevra_to_pkg = self._mk_packages(debug_arch="x86_64")
res = hybrid.expand_packages( res = hybrid.expand_packages(
nevra_to_pkg, {}, [], [("pkg-debuginfo-3:1-2", "x86_64", ["modular"])], [] nevra_to_pkg, [], [("pkg-debuginfo-3:1-2", "x86_64", ["modular"])], []
) )
self.assertEqual( self.assertEqual(
@ -933,7 +931,7 @@ class TestExpandPackages(helpers.PungiTestCase):
cr.Metadata.return_value.get.side_effect = lambda key: repo[key] cr.Metadata.return_value.get.side_effect = lambda key: repo[key]
res = hybrid.expand_packages( res = hybrid.expand_packages(
nevra_to_pkg, {}, lookasides, [("pkg-3:1-2", "x86_64", [])], [] nevra_to_pkg, lookasides, [("pkg-3:1-2", "x86_64", [])], []
) )
self.assertEqual( self.assertEqual(
@ -961,7 +959,7 @@ class TestExpandPackages(helpers.PungiTestCase):
cr.Metadata.return_value.get.side_effect = lambda key: repo[key] cr.Metadata.return_value.get.side_effect = lambda key: repo[key]
res = hybrid.expand_packages( res = hybrid.expand_packages(
nevra_to_pkg, {}, lookasides, [("pkg-3:1-2", "x86_64", [])], [] nevra_to_pkg, lookasides, [("pkg-3:1-2", "x86_64", [])], []
) )
self.assertEqual(res, {"rpm": [], "srpm": [], "debuginfo": []}) self.assertEqual(res, {"rpm": [], "srpm": [], "debuginfo": []})