fix unit tests

This commit is contained in:
Mike McLean
2021-06-10 12:58:10 -04:00
parent 7b56c6429e
commit fcd662468f
3 changed files with 21 additions and 5 deletions

View File

@@ -1152,16 +1152,24 @@ class TestBuild(BaseTestBuild):
from module_build_service.scheduler.db_session import db_session
# module should be in wait state for this test
module_build = models.ModuleBuild.get_by_id(db_session, 3)
module_build.state = models.BUILD_STATES["wait"]
db_session.commit()
# Create a dedicated database session for scheduler to avoid hang
self.run_scheduler(
msgs=[{
"msg_id": "local module build",
"event": events.MBS_MODULE_STATE_CHANGE,
"module_build_id": 3,
"module_build_state": 1
"module_build_id": module_build.id,
"module_build_state": module_build.state,
}]
)
# commit so that our assertions see the updates
db_session.commit()
reused_component_ids = {
"module-build-macros": None,
"tangerine": 3,
@@ -1239,6 +1247,11 @@ class TestBuild(BaseTestBuild):
FakeModuleBuilder.on_buildroot_add_artifacts_cb = on_buildroot_add_artifacts_cb
# module should be in wait state for this test
module_build = models.ModuleBuild.get_by_id(db_session, 3)
module_build.state = models.BUILD_STATES["wait"]
db_session.commit()
self.run_scheduler(
msgs=[{
"msg_id": "local module build",
@@ -1248,6 +1261,9 @@ class TestBuild(BaseTestBuild):
}]
)
# commit so that our assertions see the updates
db_session.commit()
# All components should be built and module itself should be in "done"
# or "ready" state.
for build in models.ModuleBuild.get_by_id(db_session, 3).component_builds: