From 469cbc88465789752f4200b62766e467bd39eb5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Kadl=C4=8D=C3=ADk?= Date: Wed, 5 Apr 2017 12:57:05 +0200 Subject: [PATCH] Fix failing test after separating builders Thanks to @jkaluza for this patch --- module_build_service/scheduler/handlers/modules.py | 8 ++++---- tests/test_scheduler/test_module_wait.py | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/module_build_service/scheduler/handlers/modules.py b/module_build_service/scheduler/handlers/modules.py index 401e03eb..a485fb5f 100644 --- a/module_build_service/scheduler/handlers/modules.py +++ b/module_build_service/scheduler/handlers/modules.py @@ -228,12 +228,12 @@ def wait(config, session, msg): log.debug("Assigning koji tag=%s to module build" % tag) build.koji_tag = tag - builder = module_build_service.builder.GenericBuilder.create( - build.owner, build.name, config.system, config, tag_name=tag, - components=[c.package for c in build.component_builds]) - builder.buildroot_connect(groups) + builder = module_build_service.builder.GenericBuilder.create_from_module( + session, build, config) + log.debug("Adding dependencies %s into buildroot for module %s" % (dependencies, module_info)) builder.buildroot_add_repos(dependencies) + # inject dist-tag into buildroot srpm = builder.get_disttag_srpm( disttag=".%s" % get_rpm_release_from_mmd(build.mmd()), diff --git a/tests/test_scheduler/test_module_wait.py b/tests/test_scheduler/test_module_wait.py index a5ed50a6..97c37790 100644 --- a/tests/test_scheduler/test_module_wait.py +++ b/tests/test_scheduler/test_module_wait.py @@ -47,15 +47,15 @@ class TestModuleWait(unittest.TestCase): def tearDown(self): self.vcr.__exit__() - @mock.patch('module_build_service.builder.KojiModuleBuilder') + @mock.patch('module_build_service.builder.GenericBuilder.create_from_module') @mock.patch('module_build_service.models.ModuleBuild.from_module_event') @mock.patch('module_build_service.pdc') - def test_init_basic(self, pdc, from_module_event, KojiModuleBuilder): + def test_init_basic(self, pdc, from_module_event, create_builder): builder = mock.Mock() builder.get_disttag_srpm.return_value = 'some srpm disttag' builder.build.return_value = 1234, 1, "", None builder.module_build_tag = {'name': 'some-tag-build'} - KojiModuleBuilder.return_value = builder + create_builder.return_value = builder mocked_module_build = mock.Mock() mocked_module_build.json.return_value = { 'name': 'foo',