Make finalization before changing state to done

Signed-off-by: Valerij Maljulin <vmaljuli@redhat.com>
This commit is contained in:
Valerij Maljulin
2019-01-29 15:56:58 +01:00
parent 89ccef5e42
commit eafa93037f
5 changed files with 43 additions and 16 deletions

View File

@@ -666,7 +666,7 @@ class TestKojiBuilder:
])
@mock.patch('module_build_service.builder.KojiModuleBuilder.KojiContentGenerator')
def test_finalize(self, mock_koji_cg_cls, cg_enabled, cg_devel_enabled):
self.module.state = 3
self.module.state = 2
with patch('module_build_service.config.Config.koji_enable_content_generator',
new_callable=mock.PropertyMock, return_value=cg_enabled):
with patch('module_build_service.config.Config.koji_cg_devel_module',

View File

@@ -75,6 +75,39 @@ class TestRepoDone:
source=('https://src.fedoraproject.org/rpms/tangerine?'
'#fbed359411a1baa08d4a88e0d12d426fbf8f602c'))
@mock.patch('module_build_service.builder.KojiModuleBuilder.'
'KojiModuleBuilder.finalize')
@mock.patch('module_build_service.builder.KojiModuleBuilder.'
'KojiModuleBuilder.recover_orphaned_artifact', return_value=[])
@mock.patch('module_build_service.builder.KojiModuleBuilder.'
'KojiModuleBuilder.get_average_build_time',
return_value=0.0)
@mock.patch('module_build_service.builder.KojiModuleBuilder.'
'KojiModuleBuilder.list_tasks_for_components',
return_value=[])
@mock.patch('module_build_service.builder.KojiModuleBuilder.'
'KojiModuleBuilder.buildroot_ready', return_value=True)
@mock.patch('module_build_service.builder.KojiModuleBuilder.'
'KojiModuleBuilder.get_session')
@mock.patch('module_build_service.builder.KojiModuleBuilder.'
'KojiModuleBuilder.build')
@mock.patch('module_build_service.builder.KojiModuleBuilder.'
'KojiModuleBuilder.buildroot_connect')
def test_a_single_match_finalize(self, connect, build_fn, get_session, ready, list_tasks_fn,
mock_gabt, mock_uea, finalizer):
""" Test that when a repo msg hits us and we have a single match.
"""
scheduler_init_data(tangerine_state=1)
get_session.return_value = mock.Mock(), 'development'
build_fn.return_value = 1234, 1, '', None
msg = module_build_service.messaging.KojiRepoChange(
'some_msg_id', 'module-testmodule-master-20170109091357-7c29193d-build')
module_build_service.scheduler.handlers.repos.done(
config=conf, session=db.session, msg=msg)
finalizer.assert_called_once()
@mock.patch('module_build_service.builder.KojiModuleBuilder.'
'KojiModuleBuilder.recover_orphaned_artifact', return_value=[])
@mock.patch('module_build_service.builder.KojiModuleBuilder.'