modules/fm-orchestrator
1
0
Fork 0
mirror of https://pagure.io/fm-orchestrator.git synced 2026-04-13 19:39:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix failing test after separating builders

Browse Source 
Thanks to @jkaluza for this patch
This commit is contained in:
Jakub Kadlčík
2017-04-05 12:57:05 +02:00
parent a7ef1f5445
commit 469cbc8846
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
module_build_service/scheduler/handlers/modules.py
View File

@@ -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()),

6
tests/test_scheduler/test_module_wait.py
View File

@@ -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',