mirror of
https://pagure.io/fm-orchestrator.git
synced 2026-03-24 22:10:28 +08:00
3878affa41
This patch separates the use of database session in different MBS components and do not mix them together. In general, MBS components could be separated as the REST API (implemented based on Flask) and non-REST API including the backend build workflow (implemented as a fedmsg consumer on top of fedmsg-hub and running independently) and library shared by them. As a result, there are two kind of database session used in MBS, one is created and managed by Flask-SQLAlchemy, and another one is created from SQLAclhemy Session API directly. The goal of this patch is to make ensure session object is used properly in the right place. All the changes follow these rules: * REST API related code uses the session object db.session created and managed by Flask-SQLAlchemy. * Non-REST API related code uses the session object created with SQLAlchemy Session API. Function make_db_session does that. * Shared code does not created a new session object as much as possible. Instead, it accepts an argument db_session. The first two rules are applicable to tests as well. Major changes: * Switch tests back to run with a file-based SQLite database. * make_session is renamed to make_db_session and SQLAlchemy connection pool options are applied for PostgreSQL backend. * Frontend Flask related code uses db.session * Shared code by REST API and backend build workflow accepts SQLAlchemy session object as an argument. For example, resolver class is constructed with a database session, and some functions accepts an argument for database session. * Build workflow related code use session object returned from make_db_session and ensure db.session is not used. * Only tests for views use db.session, and other tests use db_session fixture to access database. * All argument name session, that is for database access, are renamed to db_session. * Functions model_tests_init_data, reuse_component_init_data and reuse_shared_userspace_init_data, which creates fixture data for tests, are converted into pytest fixtures from original function called inside setup_method or a test method. The reason of this conversion is to use fixture ``db_session`` rather than create a new one. That would also benefit the whole test suite to reduce the number of SQLAlchemy session objects. Signed-off-by: Chenxiong Qi <cqi@redhat.com>
296 lines
11 KiB
Python
296 lines
11 KiB
Python
# Copyright (c) 2016 Red Hat, Inc.
|
|
#
|
|
# Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
# of this software and associated documentation files (the "Software"), to deal
|
|
# in the Software without restriction, including without limitation the rights
|
|
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
# copies of the Software, and to permit persons to whom the Software is
|
|
# furnished to do so, subject to the following conditions:
|
|
#
|
|
# The above copyright notice and this permission notice shall be included in all
|
|
# copies or substantial portions of the Software.
|
|
#
|
|
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
# SOFTWARE.
|
|
#
|
|
# Written by Ralph Bean <rbean@redhat.com>
|
|
|
|
import mock
|
|
from mock import patch
|
|
import module_build_service.messaging
|
|
import module_build_service.scheduler.handlers.modules
|
|
import os
|
|
import koji
|
|
import pytest
|
|
from tests import conf, scheduler_init_data, read_staged_data
|
|
import module_build_service.resolver
|
|
from module_build_service import build_logs, Modulemd
|
|
from module_build_service.utils.general import load_mmd
|
|
from module_build_service.models import ComponentBuild, ModuleBuild
|
|
|
|
base_dir = os.path.dirname(os.path.dirname(__file__))
|
|
|
|
|
|
class TestModuleWait:
|
|
def setup_method(self, test_method):
|
|
self.config = conf
|
|
self.session = mock.Mock()
|
|
self.fn = module_build_service.scheduler.handlers.modules.wait
|
|
|
|
def teardown_method(self, test_method):
|
|
try:
|
|
with module_build_service.models.make_db_session(conf) as db_session:
|
|
path = build_logs.path(db_session, 1)
|
|
os.remove(path)
|
|
except Exception:
|
|
pass
|
|
|
|
@patch("module_build_service.builder.GenericBuilder.create_from_module")
|
|
@patch("module_build_service.models.ModuleBuild.from_module_event")
|
|
def test_init_basic(self, 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"}
|
|
create_builder.return_value = builder
|
|
mocked_module_build = mock.Mock()
|
|
mocked_module_build.name = "foo"
|
|
mocked_module_build.stream = "stream"
|
|
mocked_module_build.version = "1"
|
|
mocked_module_build.context = "1234567"
|
|
mocked_module_build.state = 1
|
|
mocked_module_build.id = 1
|
|
mocked_module_build.json.return_value = {
|
|
"name": "foo",
|
|
"stream": "1",
|
|
"version": 1,
|
|
"state": "some state",
|
|
"id": 1,
|
|
}
|
|
mocked_module_build.id = 1
|
|
mocked_module_build.mmd.return_value = load_mmd(read_staged_data("formatted_testmodule"))
|
|
mocked_module_build.component_builds = []
|
|
|
|
from_module_event.return_value = mocked_module_build
|
|
|
|
msg = module_build_service.messaging.MBSModule(
|
|
msg_id=None, module_build_id=1, module_build_state="some state")
|
|
with patch("module_build_service.resolver.GenericResolver.create"):
|
|
self.fn(config=self.config, db_session=self.session, msg=msg)
|
|
|
|
@patch(
|
|
"module_build_service.builder.GenericBuilder.default_buildroot_groups",
|
|
return_value={"build": [], "srpm-build": []},
|
|
)
|
|
@patch("module_build_service.builder.GenericBuilder.create_from_module")
|
|
@patch("module_build_service.resolver.DBResolver")
|
|
@patch("module_build_service.resolver.GenericResolver")
|
|
def test_new_repo_called_when_macros_reused(
|
|
self, generic_resolver, resolver, create_builder, dbg, db_session
|
|
):
|
|
"""
|
|
Test that newRepo is called when module-build-macros build is reused.
|
|
"""
|
|
scheduler_init_data(db_session)
|
|
koji_session = mock.MagicMock()
|
|
koji_session.newRepo.return_value = 123456
|
|
|
|
builder = mock.MagicMock()
|
|
builder.koji_session = koji_session
|
|
builder.module_build_tag = {"name": "module-123-build"}
|
|
builder.get_disttag_srpm.return_value = "some srpm disttag"
|
|
builder.build.return_value = (
|
|
1234,
|
|
koji.BUILD_STATES["COMPLETE"],
|
|
"",
|
|
"module-build-macros-1-1",
|
|
)
|
|
create_builder.return_value = builder
|
|
|
|
resolver = mock.MagicMock()
|
|
resolver.backend = "db"
|
|
resolver.get_module_tag.return_value = "module-testmodule-master-20170109091357"
|
|
|
|
generic_resolver.create.return_value = resolver
|
|
msg = module_build_service.messaging.MBSModule(
|
|
msg_id=None, module_build_id=2, module_build_state="some state")
|
|
|
|
module_build_service.scheduler.handlers.modules.wait(
|
|
config=conf, db_session=db_session, msg=msg)
|
|
|
|
koji_session.newRepo.assert_called_once_with("module-123-build")
|
|
|
|
# When module-build-macros is reused, it still has to appear only
|
|
# once in database.
|
|
builds_count = db_session.query(ComponentBuild).filter_by(
|
|
package="module-build-macros", module_id=2).count()
|
|
assert builds_count == 1
|
|
|
|
@patch(
|
|
"module_build_service.builder.GenericBuilder.default_buildroot_groups",
|
|
return_value={"build": [], "srpm-build": []},
|
|
)
|
|
@patch("module_build_service.builder.GenericBuilder.create_from_module")
|
|
@patch("module_build_service.resolver.DBResolver")
|
|
@patch("module_build_service.resolver.GenericResolver")
|
|
def test_new_repo_not_called_when_macros_not_reused(
|
|
self, generic_resolver, resolver, create_builder, dbg, db_session
|
|
):
|
|
"""
|
|
Test that newRepo is called everytime for module-build-macros
|
|
"""
|
|
scheduler_init_data(db_session)
|
|
koji_session = mock.MagicMock()
|
|
koji_session.newRepo.return_value = 123456
|
|
|
|
builder = mock.MagicMock()
|
|
builder.koji_session = koji_session
|
|
builder.module_build_tag = {"name": "module-123-build"}
|
|
builder.get_disttag_srpm.return_value = "some srpm disttag"
|
|
builder.build.return_value = (
|
|
1234,
|
|
koji.BUILD_STATES["BUILDING"],
|
|
"",
|
|
"module-build-macros-1-1",
|
|
)
|
|
create_builder.return_value = builder
|
|
|
|
resolver = mock.MagicMock()
|
|
resolver.backend = "db"
|
|
resolver.get_module_tag.return_value = "module-testmodule-master-20170109091357"
|
|
|
|
generic_resolver.create.return_value = resolver
|
|
msg = module_build_service.messaging.MBSModule(
|
|
msg_id=None, module_build_id=2, module_build_state="some state")
|
|
|
|
module_build_service.scheduler.handlers.modules.wait(
|
|
config=conf, db_session=db_session, msg=msg)
|
|
|
|
assert koji_session.newRepo.called
|
|
|
|
@patch(
|
|
"module_build_service.builder.GenericBuilder.default_buildroot_groups",
|
|
return_value={"build": [], "srpm-build": []},
|
|
)
|
|
@patch("module_build_service.builder.GenericBuilder.create_from_module")
|
|
@patch("module_build_service.resolver.DBResolver")
|
|
@patch("module_build_service.resolver.GenericResolver")
|
|
def test_set_cg_build_koji_tag_fallback_to_default(
|
|
self, generic_resolver, resolver, create_builder, dbg, db_session
|
|
):
|
|
"""
|
|
Test that build.cg_build_koji_tag fallbacks to default tag.
|
|
"""
|
|
base_mmd = Modulemd.ModuleStreamV2.new("base-runtime", "f27")
|
|
|
|
scheduler_init_data(db_session)
|
|
koji_session = mock.MagicMock()
|
|
koji_session.newRepo.return_value = 123456
|
|
|
|
builder = mock.MagicMock()
|
|
builder.koji_session = koji_session
|
|
builder.module_build_tag = {"name": "module-123-build"}
|
|
builder.get_disttag_srpm.return_value = "some srpm disttag"
|
|
builder.build.return_value = (
|
|
1234,
|
|
koji.BUILD_STATES["BUILDING"],
|
|
"",
|
|
"module-build-macros-1-1",
|
|
)
|
|
create_builder.return_value = builder
|
|
|
|
resolver = mock.MagicMock()
|
|
resolver.backend = "db"
|
|
resolver.get_module_tag.return_value = "module-testmodule-master-20170109091357"
|
|
resolver.get_module_build_dependencies.return_value = {
|
|
"module-bootstrap-tag": [base_mmd]
|
|
}
|
|
|
|
generic_resolver.create.return_value = resolver
|
|
msg = module_build_service.messaging.MBSModule(
|
|
msg_id=None, module_build_id=2, module_build_state="some state")
|
|
|
|
module_build_service.scheduler.handlers.modules.wait(
|
|
config=conf, db_session=db_session, msg=msg)
|
|
|
|
module_build = ModuleBuild.get_by_id(db_session, 2)
|
|
assert module_build.cg_build_koji_tag == "modular-updates-candidate"
|
|
|
|
@pytest.mark.parametrize(
|
|
"koji_cg_tag_build,expected_cg_koji_build_tag",
|
|
[
|
|
[True, "f27-modular-updates-candidate"],
|
|
[False, None]
|
|
],
|
|
)
|
|
@patch(
|
|
"module_build_service.builder.GenericBuilder.default_buildroot_groups",
|
|
return_value={"build": [], "srpm-build": []},
|
|
)
|
|
@patch("module_build_service.builder.GenericBuilder.create_from_module")
|
|
@patch("module_build_service.resolver.DBResolver")
|
|
@patch("module_build_service.resolver.GenericResolver")
|
|
@patch(
|
|
"module_build_service.config.Config.base_module_names",
|
|
new_callable=mock.PropertyMock,
|
|
return_value=["base-runtime", "platform"],
|
|
)
|
|
def test_set_cg_build_koji_tag(
|
|
self,
|
|
cfg,
|
|
generic_resolver,
|
|
resolver,
|
|
create_builder,
|
|
dbg,
|
|
koji_cg_tag_build,
|
|
expected_cg_koji_build_tag,
|
|
db_session,
|
|
):
|
|
"""
|
|
Test that build.cg_build_koji_tag is set.
|
|
"""
|
|
base_mmd = Modulemd.ModuleStreamV2.new("base-runtime", "f27")
|
|
|
|
scheduler_init_data(db_session)
|
|
koji_session = mock.MagicMock()
|
|
koji_session.newRepo.return_value = 123456
|
|
|
|
builder = mock.MagicMock()
|
|
builder.koji_session = koji_session
|
|
builder.module_build_tag = {"name": "module-123-build"}
|
|
builder.get_disttag_srpm.return_value = "some srpm disttag"
|
|
builder.build.return_value = (
|
|
1234,
|
|
koji.BUILD_STATES["BUILDING"],
|
|
"",
|
|
"module-build-macros-1-1",
|
|
)
|
|
create_builder.return_value = builder
|
|
|
|
resolver = mock.MagicMock()
|
|
resolver.backend = "db"
|
|
resolver.get_module_tag.return_value = "module-testmodule-master-20170109091357"
|
|
resolver.get_module_build_dependencies.return_value = {
|
|
"module-bootstrap-tag": [base_mmd]
|
|
}
|
|
|
|
with patch.object(
|
|
module_build_service.scheduler.handlers.modules.conf,
|
|
"koji_cg_tag_build",
|
|
new=koji_cg_tag_build,
|
|
):
|
|
generic_resolver.create.return_value = resolver
|
|
msg = module_build_service.messaging.MBSModule(
|
|
msg_id=None, module_build_id=2, module_build_state="some state"
|
|
)
|
|
module_build_service.scheduler.handlers.modules.wait(
|
|
config=conf, db_session=db_session, msg=msg
|
|
)
|
|
module_build = ModuleBuild.get_by_id(db_session, 2)
|
|
assert module_build.cg_build_koji_tag == expected_cg_koji_build_tag
|