mirror of
https://pagure.io/fm-orchestrator.git
synced 2026-04-02 10:20:31 +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>
216 lines
9.0 KiB
Python
216 lines
9.0 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 pytest
|
|
|
|
from mock import patch
|
|
from module_build_service import conf
|
|
from module_build_service.models import ComponentBuild, ComponentBuildTrace, ModuleBuild
|
|
from module_build_service.utils.general import mmd_to_str, load_mmd
|
|
from tests import init_data as init_data_contexts, clean_database, make_module, read_staged_data
|
|
from tests import module_build_from_modulemd
|
|
|
|
|
|
@pytest.mark.usefixtures("model_tests_init_data")
|
|
class TestModels:
|
|
|
|
def test_app_sqlalchemy_events(self, db_session):
|
|
component_build = ComponentBuild(
|
|
package="before_models_committed",
|
|
scmurl="git://pkgs.domain.local/rpms/before_models_committed?"
|
|
"#9999999999999999999999999999999999999999",
|
|
format="rpms",
|
|
task_id=999999999,
|
|
state=1,
|
|
nvr="before_models_committed-0.0.0-0.module_before_models_committed_0_0",
|
|
batch=1,
|
|
module_id=1,
|
|
)
|
|
|
|
db_session.add(component_build)
|
|
db_session.commit()
|
|
|
|
component_builds_trace = db_session.query(ComponentBuildTrace).filter(
|
|
ComponentBuildTrace.component_id == component_build.id).one()
|
|
db_session.commit()
|
|
|
|
assert component_builds_trace.id == 1
|
|
assert component_builds_trace.component_id == 1
|
|
assert component_builds_trace.state == 1
|
|
assert component_builds_trace.state_reason is None
|
|
assert component_builds_trace.task_id == 999999999
|
|
|
|
def test_context_functions(self, db_session):
|
|
""" Test that the build_context, runtime_context, and context hashes are correctly
|
|
determined"""
|
|
db_session.commit()
|
|
|
|
build = ModuleBuild.get_by_id(db_session, 1)
|
|
db_session.commit()
|
|
build.modulemd = read_staged_data("testmodule_dependencies")
|
|
(
|
|
build.ref_build_context,
|
|
build.build_context,
|
|
build.runtime_context,
|
|
build.context,
|
|
) = ModuleBuild.contexts_from_mmd(build.modulemd)
|
|
assert build.ref_build_context == "f6e2aeec7576196241b9afa0b6b22acf2b6873d7"
|
|
assert build.build_context == "089df24993c037e10174f3fa7342ab4dc191a4d4"
|
|
assert build.runtime_context == "bbc84c7b817ab3dd54916c0bcd6c6bdf512f7f9c"
|
|
assert build.context == "3ee22b28"
|
|
|
|
def test_siblings_property(self, db_session):
|
|
""" Tests that the siblings property returns the ID of all modules with
|
|
the same name:stream:version
|
|
"""
|
|
clean_database()
|
|
mmd = load_mmd(read_staged_data("formatted_testmodule"))
|
|
for i in range(3):
|
|
build = module_build_from_modulemd(mmd_to_str(mmd))
|
|
build.build_context = "f6e2aeec7576196241b9afa0b6b22acf2b6873d" + str(i)
|
|
build.runtime_context = "bbc84c7b817ab3dd54916c0bcd6c6bdf512f7f9c" + str(i)
|
|
db_session.add(build)
|
|
db_session.commit()
|
|
|
|
build_one = ModuleBuild.get_by_id(db_session, 2)
|
|
sibling_ids = build_one.siblings(db_session)
|
|
db_session.commit()
|
|
|
|
assert sibling_ids == [3, 4]
|
|
|
|
@pytest.mark.parametrize(
|
|
"stream,right_pad,expected",
|
|
[
|
|
["f27", True, 270000.0],
|
|
["f27.02.30", True, 270230.0],
|
|
["f27", False, 27.0],
|
|
["f27.02.30", False, 270230.0],
|
|
["el8", True, 080000.0],
|
|
["el8.1.0", True, 080100.0],
|
|
["el8.z", True, 080000.2],
|
|
["el8.1.0.z", True, 080100.3],
|
|
],
|
|
)
|
|
@patch.object(conf, "stream_suffixes", new={r"el\d+\.z": 0.2, r"el\d+\.\d+\.\d+\.z": 0.3})
|
|
def test_get_stream_version(self, stream, right_pad, expected):
|
|
assert expected == ModuleBuild.get_stream_version(stream, right_pad)
|
|
|
|
|
|
class TestModelsGetStreamsContexts:
|
|
def test_get_last_build_in_all_streams(self, db_session):
|
|
init_data_contexts(contexts=True)
|
|
builds = ModuleBuild.get_last_build_in_all_streams(db_session, "nginx")
|
|
builds = sorted([
|
|
"%s:%s:%s" % (build.name, build.stream, str(build.version)) for build in builds
|
|
])
|
|
db_session.commit()
|
|
assert builds == ["nginx:%d:%d" % (i, i + 2) for i in range(10)]
|
|
|
|
def test_get_last_build_in_all_stream_last_version(self, db_session):
|
|
init_data_contexts(contexts=False)
|
|
builds = ModuleBuild.get_last_build_in_all_streams(db_session, "nginx")
|
|
builds = [
|
|
"%s:%s:%s" % (build.name, build.stream, str(build.version)) for build in builds
|
|
]
|
|
db_session.commit()
|
|
assert builds == ["nginx:1:11"]
|
|
|
|
def test_get_last_builds_in_stream(self, db_session):
|
|
init_data_contexts(contexts=True)
|
|
builds = ModuleBuild.get_last_builds_in_stream(db_session, "nginx", "1")
|
|
builds = [
|
|
"%s:%s:%s:%s" % (build.name, build.stream, str(build.version), build.context)
|
|
for build in builds
|
|
]
|
|
db_session.commit()
|
|
assert builds == ["nginx:1:3:d5a6c0fa", "nginx:1:3:795e97c1"]
|
|
|
|
def test_get_last_builds_in_stream_version_lte(self, db_session):
|
|
init_data_contexts(1, multiple_stream_versions=True)
|
|
builds = ModuleBuild.get_last_builds_in_stream_version_lte(db_session, "platform", 290100)
|
|
builds = set([
|
|
"%s:%s:%s:%s" % (build.name, build.stream, str(build.version), build.context)
|
|
for build in builds
|
|
])
|
|
db_session.commit()
|
|
assert builds == set(["platform:f29.0.0:3:00000000", "platform:f29.1.0:3:00000000"])
|
|
|
|
def test_get_last_builds_in_stream_version_lte_different_versions(self, db_session):
|
|
"""
|
|
Tests that get_last_builds_in_stream_version_lte works in case the
|
|
name:stream_ver modules have different versions.
|
|
"""
|
|
clean_database(False)
|
|
|
|
make_module(
|
|
db_session, "platform:f29.1.0:10:old_version", {}, {}, virtual_streams=["f29"])
|
|
make_module(
|
|
db_session, "platform:f29.1.0:15:c11.another", {}, {}, virtual_streams=["f29"])
|
|
make_module(
|
|
db_session, "platform:f29.1.0:15:c11", {}, {}, virtual_streams=["f29"])
|
|
make_module(
|
|
db_session, "platform:f29.2.0:0:old_version", {}, {}, virtual_streams=["f29"])
|
|
make_module(
|
|
db_session, "platform:f29.2.0:1:c11", {}, {}, virtual_streams=["f29"])
|
|
make_module(
|
|
db_session, "platform:f29.3.0:15:old_version", {}, {}, virtual_streams=["f29"])
|
|
make_module(
|
|
db_session, "platform:f29.3.0:20:c11", {}, {}, virtual_streams=["f29"])
|
|
|
|
builds = ModuleBuild.get_last_builds_in_stream_version_lte(
|
|
db_session, "platform", 290200)
|
|
builds = set([
|
|
"%s:%s:%s:%s" % (build.name, build.stream, str(build.version), build.context)
|
|
for build in builds
|
|
])
|
|
db_session.commit()
|
|
assert builds == set([
|
|
"platform:f29.1.0:15:c11",
|
|
"platform:f29.1.0:15:c11.another",
|
|
"platform:f29.2.0:1:c11",
|
|
])
|
|
|
|
def test_get_module_count(self, db_session):
|
|
clean_database(False)
|
|
make_module(db_session, "platform:f29.1.0:10:c11", {}, {})
|
|
make_module(db_session, "platform:f29.1.0:10:c12", {}, {})
|
|
|
|
count = ModuleBuild.get_module_count(db_session, name="platform")
|
|
db_session.commit()
|
|
assert count == 2
|
|
|
|
def test_add_virtual_streams_filter(self, db_session):
|
|
clean_database(False)
|
|
|
|
make_module(db_session, "platform:f29.1.0:10:c1", {}, {}, virtual_streams=["f29"])
|
|
make_module(db_session, "platform:f29.1.0:15:c1", {}, {}, virtual_streams=["f29"])
|
|
make_module(
|
|
db_session, "platform:f29.3.0:15:old_version", {}, {},
|
|
virtual_streams=["f28", "f29"])
|
|
make_module(db_session, "platform:f29.3.0:20:c11", {}, {}, virtual_streams=["f30"])
|
|
|
|
query = db_session.query(ModuleBuild).filter_by(name="platform")
|
|
query = ModuleBuild._add_virtual_streams_filter(db_session, query, ["f28", "f29"])
|
|
count = query.count()
|
|
db_session.commit()
|
|
assert count == 3
|