robojerk/tumbi-assembler
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

hybrid: Honor filter_packages

Browse source 
JIRA: COMPOSE-3011
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2018-10-16 12:29:00 +02:00
parent 111af836ea
commit 4f712259d7
4 changed files with 49 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tests/test_fus_wrapper.py
View file

@ -29,6 +29,7 @@ class TestGetCmd(unittest.TestCase):
["pkg"],
["mod:1.0"],
platform="f29",
filter_packages=["foo", "bar"],
)
self.assertEqual(
cmd,
@ -42,6 +43,8 @@ class TestGetCmd(unittest.TestCase):
"--repo=repo-0,repo,/tmp/first",
"--repo=repo-1,repo,/tmp/second",
"--platform=f29",
"--exclude=bar",
"--exclude=foo",
"module(mod:1.0)",
"pkg",
],

35
tests/test_gather_method_hybrid.py
View file

@ -54,7 +54,7 @@ class TestMethodHybrid(helpers.PungiTestCase):
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"]), cmr.return_value)],
[mock.call(variant, arch, set(["pkg", "foo", "bar"]), cmr.return_value, [])],
)
self.assertEqual(
ep.call_args_list,
@ -333,6 +333,7 @@ class TestRunSolver(HelperMixin, helpers.PungiTestCase):
"x86_64",
[],
platform="pl",
filter_packages=["foo"],
)
self.assertEqual(res, po.return_value)
@ -355,6 +356,7 @@ class TestRunSolver(HelperMixin, helpers.PungiTestCase):
[],
["mod:master"],
platform="pl",
filter_packages=["foo"],
)
],
)
@ -382,6 +384,7 @@ class TestRunSolver(HelperMixin, helpers.PungiTestCase):
"x86_64",
[],
platform="pl",
filter_packages=["foo"],
)
self.assertEqual(res, po.return_value)
@ -404,6 +407,7 @@ class TestRunSolver(HelperMixin, helpers.PungiTestCase):
[],
["mod:master", "mod-devel:master"],
platform="pl",
filter_packages=["foo"],
)
],
)
@ -415,6 +419,7 @@ class TestRunSolver(HelperMixin, helpers.PungiTestCase):
"x86_64",
[("pkg", None)],
platform=None,
filter_packages=[],
)
self.assertEqual(res, po.return_value)
@ -429,7 +434,17 @@ class TestRunSolver(HelperMixin, helpers.PungiTestCase):
)
self.assertEqual(
gc.call_args_list,
[mock.call("x86_64", [self._repo("repo")], [], ["pkg"], [], platform=None)],
[
mock.call(
"x86_64",
[self._repo("repo")],
[],
["pkg"],
[],
platform=None,
filter_packages=[],
)
],
)
def test_with_langpacks(self, run, gc, po):
@ -442,6 +457,7 @@ class TestRunSolver(HelperMixin, helpers.PungiTestCase):
"x86_64",
[("pkg", None)],
platform=None,
filter_packages=["foo"],
)
self.assertEqual(res, (final, []))
@ -463,7 +479,13 @@ class TestRunSolver(HelperMixin, helpers.PungiTestCase):
gc.call_args_list,
[
mock.call(
"x86_64", [self._repo("repo")], [], ["pkg"], [], platform=None
"x86_64",
[self._repo("repo")],
[],
["pkg"],
[],
platform=None,
filter_packages=["foo"],
),
mock.call(
"x86_64",
@ -472,6 +494,7 @@ class TestRunSolver(HelperMixin, helpers.PungiTestCase):
["pkg", "pkg-en"],
[],
platform=None,
filter_packages=["foo"],
),
],
)
@ -509,6 +532,7 @@ class TestRunSolver(HelperMixin, helpers.PungiTestCase):
"x86_64",
[("pkg-devel", None), ("foo", None)],
platform=None,
filter_packages=[],
)
self.assertEqual(res, (final, []))
@ -536,6 +560,7 @@ class TestRunSolver(HelperMixin, helpers.PungiTestCase):
["pkg-devel", "foo"],
[],
platform=None,
filter_packages=[],
),
mock.call(
"x86_64",
@ -544,6 +569,7 @@ class TestRunSolver(HelperMixin, helpers.PungiTestCase):
["pkg-devel", "foo", "pkg-devel.i686"],
[],
platform=None,
filter_packages=[],
),
],
)
@ -607,6 +633,7 @@ class TestRunSolver(HelperMixin, helpers.PungiTestCase):
"x86_64",
[("pkg-devel", None), ("foo", None)],
platform=None,
filter_packages=[],
)
self.assertEqual(res, (final, []))
@ -634,6 +661,7 @@ class TestRunSolver(HelperMixin, helpers.PungiTestCase):
["pkg-devel", "foo"],
[],
platform=None,
filter_packages=[],
),
mock.call(
"x86_64",
@ -642,6 +670,7 @@ class TestRunSolver(HelperMixin, helpers.PungiTestCase):
["pkg-devel", "foo", "foo.i686"],
[],
platform=None,
filter_packages=[],
),
],
)