From a28df5edb7e0462325817e20d5c246d0f0e86ab5 Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Mon, 30 Sep 2019 09:04:21 +0200 Subject: [PATCH] Return an empty list in `KojiResolver.get_compatible_base_module_modulemds`. For KojiResolver, this method returns always an empty list. The compatible modules are defined by the Koji tag inheritance, so there is no need to find out the compatible base modules on MBS side. This makes `mse.get_base_module_mmds` to ignore virtual streams and just use the input base module as the only module without finding the compatible base modules. --- module_build_service/resolver/KojiResolver.py | 8 ++++++++ tests/test_resolver/test_koji.py | 11 ++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/module_build_service/resolver/KojiResolver.py b/module_build_service/resolver/KojiResolver.py index 39d282a8..6bda6819 100644 --- a/module_build_service/resolver/KojiResolver.py +++ b/module_build_service/resolver/KojiResolver.py @@ -160,3 +160,11 @@ class KojiResolver(DBResolver): mmds.append(module.mmd()) return mmds + + def get_compatible_base_module_modulemds(self, *args, **kwargs): + """ + For KojiResolver, this method returns always an empty list. The compatible modules are + defined by the Koji tag inheritance, so there is no need to find out the compatible + base modules on MBS side. + """ + return [] diff --git a/tests/test_resolver/test_koji.py b/tests/test_resolver/test_koji.py index 40d094fb..7fe3b49f 100644 --- a/tests/test_resolver/test_koji.py +++ b/tests/test_resolver/test_koji.py @@ -26,7 +26,7 @@ from datetime import datetime import module_build_service.resolver as mbs_resolver from module_build_service.utils.general import import_mmd, mmd_to_str, load_mmd -from module_build_service.models import ModuleBuild +from module_build_service.models import ModuleBuild, BUILD_STATES import tests @@ -212,3 +212,12 @@ class TestLocalResolverModule: assert nvrs == { "testmodule-master-20170110091357.7c29193d", "testmodule-2-20180109091357.7c29193d"} + + def test_get_compatible_base_module_modulemds(self, db_session): + tests.init_data(1, multiple_stream_versions=True) + resolver = mbs_resolver.GenericResolver.create(db_session, tests.conf, backend="koji") + result = resolver.get_compatible_base_module_modulemds( + "platform", "f29.1.0", stream_version_lte=True, virtual_streams=["f29"], + states=[BUILD_STATES["ready"]]) + + assert len(result) == 0