diff --git a/module_build_service/builder/KojiContentGenerator.py b/module_build_service/builder/KojiContentGenerator.py index 56e4883b..613f9963 100644 --- a/module_build_service/builder/KojiContentGenerator.py +++ b/module_build_service/builder/KojiContentGenerator.py @@ -24,7 +24,7 @@ import pungi.arch from module_build_service import conf, log, build_logs, Modulemd from module_build_service.common.koji import get_session, koji_retrying_multicall_map from module_build_service.common.utils import load_mmd, mmd_to_str, to_text_type -from module_build_service.db_session import db_session +from module_build_service.scheduler.db_session import db_session from module_build_service.scm import SCM logging.basicConfig(level=logging.DEBUG) diff --git a/module_build_service/builder/KojiModuleBuilder.py b/module_build_service/builder/KojiModuleBuilder.py index ecce661a..a5911f9a 100644 --- a/module_build_service/builder/KojiModuleBuilder.py +++ b/module_build_service/builder/KojiModuleBuilder.py @@ -24,7 +24,7 @@ import textwrap from module_build_service import log, conf, models from module_build_service.builder.utils import execute_cmd, get_rpm_release, validate_koji_tag from module_build_service.common.retry import retry -from module_build_service.db_session import db_session +from module_build_service.scheduler.db_session import db_session from module_build_service.builder import GenericBuilder from module_build_service.builder.KojiContentGenerator import KojiContentGenerator from module_build_service.common.koji import ( diff --git a/module_build_service/builder/MockModuleBuilder.py b/module_build_service/builder/MockModuleBuilder.py index 3672805a..1ae943b2 100644 --- a/module_build_service/builder/MockModuleBuilder.py +++ b/module_build_service/builder/MockModuleBuilder.py @@ -23,7 +23,7 @@ from module_build_service.builder.utils import ( get_koji_config, validate_koji_tag, ) -from module_build_service.db_session import db_session +from module_build_service.scheduler.db_session import db_session from module_build_service.builder.KojiModuleBuilder import KojiModuleBuilder from module_build_service.scheduler import events from module_build_service import models diff --git a/module_build_service/manage.py b/module_build_service/manage.py index eb077009..66b7a5d2 100755 --- a/module_build_service/manage.py +++ b/module_build_service/manage.py @@ -15,7 +15,7 @@ from module_build_service.builder.MockModuleBuilder import ( import_builds_from_local_dnf_repos, load_local_builds ) from module_build_service.common.utils import load_mmd_file, import_mmd -from module_build_service.db_session import db_session +from module_build_service.scheduler.db_session import db_session from module_build_service.errors import StreamAmbigous import module_build_service.messaging import module_build_service.scheduler.consumer diff --git a/module_build_service/route.py b/module_build_service/route.py index d130347f..5d540770 100644 --- a/module_build_service/route.py +++ b/module_build_service/route.py @@ -4,7 +4,7 @@ import inspect from module_build_service import conf, log, models -from module_build_service.db_session import db_session +from module_build_service.scheduler.db_session import db_session from module_build_service.scheduler.handlers.greenwave import get_corresponding_module_build diff --git a/module_build_service/scheduler/batches.py b/module_build_service/scheduler/batches.py index 4bcabbb1..389f3364 100644 --- a/module_build_service/scheduler/batches.py +++ b/module_build_service/scheduler/batches.py @@ -4,7 +4,7 @@ import threading import concurrent.futures from module_build_service import conf, log, models -from module_build_service.db_session import db_session +from module_build_service.scheduler.db_session import db_session from module_build_service.scheduler import events from module_build_service.scheduler.reuse import get_reusable_components, reuse_component diff --git a/module_build_service/scheduler/consumer.py b/module_build_service/scheduler/consumer.py index 84511f9a..5a7c48ff 100644 --- a/module_build_service/scheduler/consumer.py +++ b/module_build_service/scheduler/consumer.py @@ -23,7 +23,7 @@ import module_build_service.messaging import module_build_service.monitor as monitor from module_build_service import models, log, conf -from module_build_service.db_session import db_session +from module_build_service.scheduler.db_session import db_session from module_build_service.errors import IgnoreMessage from module_build_service.messaging import default_messaging_backend from module_build_service.scheduler import events diff --git a/module_build_service/db_session.py b/module_build_service/scheduler/db_session.py similarity index 100% rename from module_build_service/db_session.py rename to module_build_service/scheduler/db_session.py diff --git a/module_build_service/scheduler/default_modules.py b/module_build_service/scheduler/default_modules.py index 074bfed2..56b5ba37 100644 --- a/module_build_service/scheduler/default_modules.py +++ b/module_build_service/scheduler/default_modules.py @@ -16,7 +16,7 @@ from module_build_service.common.resolve import ( expand_single_mse_streams, get_compatible_base_module_mmds ) from module_build_service.common.retry import retry -from module_build_service.db_session import db_session +from module_build_service.scheduler.db_session import db_session from module_build_service.errors import UnprocessableEntity from module_build_service.resolver.base import GenericResolver diff --git a/module_build_service/scheduler/handlers/components.py b/module_build_service/scheduler/handlers/components.py index e2440ef3..76619722 100644 --- a/module_build_service/scheduler/handlers/components.py +++ b/module_build_service/scheduler/handlers/components.py @@ -9,7 +9,7 @@ from module_build_service import celery_app, conf, models, log from module_build_service.builder import GenericBuilder from module_build_service.common.koji import get_session from module_build_service.common.utils import mmd_to_str -from module_build_service.db_session import db_session +from module_build_service.scheduler.db_session import db_session from module_build_service.scheduler import events from module_build_service.scheduler.batches import continue_batch_build diff --git a/module_build_service/scheduler/handlers/greenwave.py b/module_build_service/scheduler/handlers/greenwave.py index be2c96f0..e06f110b 100644 --- a/module_build_service/scheduler/handlers/greenwave.py +++ b/module_build_service/scheduler/handlers/greenwave.py @@ -2,7 +2,7 @@ # SPDX-License-Identifier: MIT from module_build_service import celery_app, conf, log from module_build_service.common.koji import get_session -from module_build_service.db_session import db_session +from module_build_service.scheduler.db_session import db_session from module_build_service.models import ModuleBuild, BUILD_STATES from module_build_service.scheduler import events diff --git a/module_build_service/scheduler/handlers/modules.py b/module_build_service/scheduler/handlers/modules.py index 7bc733ee..d22d9d5d 100644 --- a/module_build_service/scheduler/handlers/modules.py +++ b/module_build_service/scheduler/handlers/modules.py @@ -13,7 +13,7 @@ from module_build_service.scheduler.submit import ( record_filtered_rpms, record_module_build_arches ) -from module_build_service.db_session import db_session +from module_build_service.scheduler.db_session import db_session from module_build_service.builder import GenericBuilder from module_build_service.errors import UnprocessableEntity, Forbidden, ValidationError from module_build_service.scheduler.default_modules import ( diff --git a/module_build_service/scheduler/handlers/repos.py b/module_build_service/scheduler/handlers/repos.py index 3f0fc1e7..bf064c0a 100644 --- a/module_build_service/scheduler/handlers/repos.py +++ b/module_build_service/scheduler/handlers/repos.py @@ -7,7 +7,7 @@ from datetime import datetime from module_build_service import celery_app, conf, models, log from module_build_service.builder import GenericBuilder from module_build_service.scheduler.batches import start_next_batch_build -from module_build_service.db_session import db_session +from module_build_service.scheduler.db_session import db_session from module_build_service.scheduler import events logging.basicConfig(level=logging.DEBUG) diff --git a/module_build_service/scheduler/handlers/tags.py b/module_build_service/scheduler/handlers/tags.py index 06223179..aa9b9ca0 100644 --- a/module_build_service/scheduler/handlers/tags.py +++ b/module_build_service/scheduler/handlers/tags.py @@ -5,7 +5,7 @@ import logging import koji from module_build_service import celery_app, conf, models, log -from module_build_service.db_session import db_session +from module_build_service.scheduler.db_session import db_session from module_build_service.builder import GenericBuilder from module_build_service.scheduler import events diff --git a/module_build_service/scheduler/local.py b/module_build_service/scheduler/local.py index 67b8d548..3ce32245 100644 --- a/module_build_service/scheduler/local.py +++ b/module_build_service/scheduler/local.py @@ -4,7 +4,7 @@ import logging from module_build_service import models -from module_build_service.db_session import db_session +from module_build_service.scheduler.db_session import db_session from module_build_service.scheduler.handlers.modules import init as modules_init_handler from module_build_service.scheduler.handlers.modules import wait as modules_wait_handler from module_build_service.scheduler.handlers.modules import done as modules_done_handler diff --git a/module_build_service/scheduler/producer.py b/module_build_service/scheduler/producer.py index 33d2a67a..cad5c69f 100644 --- a/module_build_service/scheduler/producer.py +++ b/module_build_service/scheduler/producer.py @@ -12,7 +12,7 @@ import module_build_service.scheduler.consumer from module_build_service import celery_app, conf, models, log from module_build_service.builder import GenericBuilder from module_build_service.common.koji import get_session -from module_build_service.db_session import db_session +from module_build_service.scheduler.db_session import db_session from module_build_service.scheduler.batches import ( at_concurrent_component_threshold, start_next_batch_build, diff --git a/module_build_service/scheduler/reuse.py b/module_build_service/scheduler/reuse.py index 6e4672cc..a93d14c4 100644 --- a/module_build_service/scheduler/reuse.py +++ b/module_build_service/scheduler/reuse.py @@ -3,7 +3,7 @@ import kobo.rpmlib from module_build_service import log, models, conf -from module_build_service.db_session import db_session +from module_build_service.scheduler.db_session import db_session from module_build_service.resolver import GenericResolver from module_build_service.scheduler import events from module_build_service.common.resolve import get_base_module_mmds diff --git a/module_build_service/scheduler/submit.py b/module_build_service/scheduler/submit.py index 1e3bebfa..75f737a6 100644 --- a/module_build_service/scheduler/submit.py +++ b/module_build_service/scheduler/submit.py @@ -10,7 +10,7 @@ import kobo.rpmlib from module_build_service import conf, log, models, Modulemd from module_build_service.common.submit import fetch_mmd from module_build_service.common.utils import to_text_type -from module_build_service.db_session import db_session +from module_build_service.scheduler.db_session import db_session from module_build_service.errors import ValidationError, UnprocessableEntity, Forbidden import module_build_service.scm diff --git a/module_build_service/scheduler/ursine.py b/module_build_service/scheduler/ursine.py index 4085fd6c..9f25c67d 100644 --- a/module_build_service/scheduler/ursine.py +++ b/module_build_service/scheduler/ursine.py @@ -4,7 +4,7 @@ import re from module_build_service import conf, log from module_build_service.common.koji import get_session -from module_build_service.db_session import db_session +from module_build_service.scheduler.db_session import db_session from module_build_service.resolver import GenericResolver diff --git a/tests/__init__.py b/tests/__init__.py index 3181fec5..3a527a75 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -20,7 +20,7 @@ from module_build_service.models import ( BUILD_STATES, ) from module_build_service import Modulemd -from module_build_service.db_session import db_session +from module_build_service.scheduler.db_session import db_session base_dir = os.path.dirname(__file__) diff --git a/tests/conftest.py b/tests/conftest.py index e1930395..6bc565a4 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -10,7 +10,7 @@ import module_build_service from module_build_service.builder.utils import get_rpm_release from module_build_service.common.utils import load_mmd, mmd_to_str from module_build_service.models import BUILD_STATES -from module_build_service.db_session import db_session +from module_build_service.scheduler.db_session import db_session from tests import clean_database, read_staged_data, module_build_from_modulemd BASE_DIR = os.path.dirname(__file__) diff --git a/tests/test_build/test_build.py b/tests/test_build/test_build.py index c7983241..b508fe60 100644 --- a/tests/test_build/test_build.py +++ b/tests/test_build/test_build.py @@ -20,7 +20,7 @@ import module_build_service.scheduler.consumer import module_build_service.scheduler.handlers.repos from module_build_service.errors import Forbidden from module_build_service import app, models, conf, build_logs, log -from module_build_service.db_session import db_session +from module_build_service.scheduler.db_session import db_session from module_build_service.scheduler import events from module_build_service.scheduler.handlers.tags import tagged as tagged_handler from module_build_service.scheduler.handlers.components import ( @@ -1149,7 +1149,7 @@ class TestBuild(BaseTestBuild): FakeModuleBuilder.on_buildroot_add_artifacts_cb = on_buildroot_add_artifacts_cb - from module_build_service.db_session import db_session + from module_build_service.scheduler.db_session import db_session # Create a dedicated database session for scheduler to avoid hang self.run_scheduler( @@ -1190,7 +1190,7 @@ class TestBuild(BaseTestBuild): """ # Firstly, remove all existing module-build-macros component builds - from module_build_service.db_session import db_session + from module_build_service.scheduler.db_session import db_session macros_cb_query = db_session.query(models.ComponentBuild).filter_by( package="module-build-macros") diff --git a/tests/test_builder/test_base.py b/tests/test_builder/test_base.py index 92b5d729..f9c06db9 100644 --- a/tests/test_builder/test_base.py +++ b/tests/test_builder/test_base.py @@ -8,7 +8,7 @@ import module_build_service.resolver from tests import init_data -from module_build_service.db_session import db_session +from module_build_service.scheduler.db_session import db_session from module_build_service.builder import GenericBuilder from mock import patch diff --git a/tests/test_builder/test_builder_utils.py b/tests/test_builder/test_builder_utils.py index a1141f26..3c2ddda1 100644 --- a/tests/test_builder/test_builder_utils.py +++ b/tests/test_builder/test_builder_utils.py @@ -8,7 +8,7 @@ import pytest from module_build_service import conf, models from module_build_service.builder import utils -from module_build_service.db_session import db_session +from module_build_service.scheduler.db_session import db_session from module_build_service.errors import ProgrammingError, ValidationError from module_build_service.common.utils import load_mmd, import_mmd, mmd_to_str from tests import init_data, read_staged_data, scheduler_init_data diff --git a/tests/test_builder/test_koji.py b/tests/test_builder/test_koji.py index 0a86a877..72cb9d83 100644 --- a/tests/test_builder/test_koji.py +++ b/tests/test_builder/test_koji.py @@ -15,7 +15,7 @@ import module_build_service.scheduler.handlers.repos import module_build_service.models from module_build_service import conf, Modulemd from module_build_service.common.utils import mmd_to_str -from module_build_service.db_session import db_session +from module_build_service.scheduler.db_session import db_session from module_build_service.builder.KojiModuleBuilder import KojiModuleBuilder from module_build_service.builder import GenericBuilder from module_build_service.scheduler import events diff --git a/tests/test_builder/test_mock.py b/tests/test_builder/test_mock.py index 25b4a7a3..0f676fdf 100644 --- a/tests/test_builder/test_mock.py +++ b/tests/test_builder/test_mock.py @@ -12,7 +12,7 @@ import pytest from module_build_service import conf, models from module_build_service.common.utils import load_mmd, mmd_to_str -from module_build_service.db_session import db_session +from module_build_service.scheduler.db_session import db_session from module_build_service.models import ModuleBuild, ComponentBuild from module_build_service.builder.MockModuleBuilder import ( import_fake_base_module, diff --git a/tests/test_common/test_resolve.py b/tests/test_common/test_resolve.py index 933b4470..35a0d546 100644 --- a/tests/test_common/test_resolve.py +++ b/tests/test_common/test_resolve.py @@ -6,7 +6,7 @@ import pytest from module_build_service.common.utils import load_mmd from module_build_service.common.resolve import get_base_module_mmds from module_build_service import Modulemd, models -from module_build_service.db_session import db_session +from module_build_service.scheduler.db_session import db_session from tests import clean_database, make_module_in_db, init_data, read_staged_data diff --git a/tests/test_common/test_utils.py b/tests/test_common/test_utils.py index f7c10f9b..966a5ae7 100644 --- a/tests/test_common/test_utils.py +++ b/tests/test_common/test_utils.py @@ -4,7 +4,7 @@ import pytest from module_build_service import models from module_build_service.common.utils import import_mmd, load_mmd -from module_build_service.db_session import db_session +from module_build_service.scheduler.db_session import db_session from module_build_service.errors import UnprocessableEntity from tests import clean_database, read_staged_data diff --git a/tests/test_content_generator.py b/tests/test_content_generator.py index c184691b..fe29ad6d 100644 --- a/tests/test_content_generator.py +++ b/tests/test_content_generator.py @@ -9,7 +9,7 @@ from os import path from module_build_service import models, conf, build_logs, Modulemd from module_build_service.common.utils import load_mmd, load_mmd_file, mmd_to_str -from module_build_service.db_session import db_session +from module_build_service.scheduler.db_session import db_session from mock import patch, Mock, call, mock_open import kobo.rpmlib diff --git a/tests/test_logger.py b/tests/test_logger.py index 3205f2f8..30457a26 100644 --- a/tests/test_logger.py +++ b/tests/test_logger.py @@ -6,7 +6,7 @@ import shutil import tempfile from module_build_service import log, models -from module_build_service.db_session import db_session +from module_build_service.scheduler.db_session import db_session from module_build_service.logger import ModuleBuildLogs from module_build_service.scheduler.consumer import MBSConsumer from tests import init_data diff --git a/tests/test_manage.py b/tests/test_manage.py index 49dbc1a5..38bf6048 100644 --- a/tests/test_manage.py +++ b/tests/test_manage.py @@ -4,7 +4,7 @@ import pytest from mock import patch from module_build_service import app, models -from module_build_service.db_session import db_session +from module_build_service.scheduler.db_session import db_session from module_build_service.manage import manager_wrapper, retire from module_build_service.models import BUILD_STATES, ModuleBuild from module_build_service.web.utils import deps_to_dict diff --git a/tests/test_models/test_models.py b/tests/test_models/test_models.py index 9d23e90a..78e3f3ab 100644 --- a/tests/test_models/test_models.py +++ b/tests/test_models/test_models.py @@ -5,7 +5,7 @@ import pytest from mock import patch from module_build_service import conf from module_build_service.common.utils import load_mmd, mmd_to_str -from module_build_service.db_session import db_session +from module_build_service.scheduler.db_session import db_session from module_build_service.models import ComponentBuild, ComponentBuildTrace, ModuleBuild from tests import init_data as init_data_contexts, clean_database, read_staged_data from tests import make_module_in_db, module_build_from_modulemd diff --git a/tests/test_monitor.py b/tests/test_monitor.py index b0de33bc..7d03d99e 100644 --- a/tests/test_monitor.py +++ b/tests/test_monitor.py @@ -9,7 +9,7 @@ from six.moves import reload_module import module_build_service.monitor from module_build_service import app, conf, models -from module_build_service.db_session import db_session +from module_build_service.scheduler.db_session import db_session from tests import init_data, make_module_in_db num_of_metrics = 18 diff --git a/tests/test_resolver/test_db.py b/tests/test_resolver/test_db.py index e8bce9ea..697c5eab 100644 --- a/tests/test_resolver/test_db.py +++ b/tests/test_resolver/test_db.py @@ -11,7 +11,7 @@ from module_build_service import conf, models, Modulemd from module_build_service.common.utils import import_mmd, load_mmd, mmd_to_str from module_build_service.models import ModuleBuild from module_build_service.errors import UnprocessableEntity -from module_build_service.db_session import db_session +from module_build_service.scheduler.db_session import db_session from module_build_service.builder.MockModuleBuilder import load_local_builds import tests diff --git a/tests/test_resolver/test_koji.py b/tests/test_resolver/test_koji.py index a0f930fe..14eefe89 100644 --- a/tests/test_resolver/test_koji.py +++ b/tests/test_resolver/test_koji.py @@ -8,7 +8,7 @@ from module_build_service import conf from module_build_service.common.utils import import_mmd, load_mmd, mmd_to_str import module_build_service.resolver as mbs_resolver import tests -from module_build_service.db_session import db_session +from module_build_service.scheduler.db_session import db_session from module_build_service.models import ModuleBuild, BUILD_STATES diff --git a/tests/test_resolver/test_local.py b/tests/test_resolver/test_local.py index 0ca11b48..62e45c1c 100644 --- a/tests/test_resolver/test_local.py +++ b/tests/test_resolver/test_local.py @@ -6,7 +6,7 @@ from datetime import datetime from module_build_service import conf from module_build_service.common.utils import import_mmd, load_mmd, mmd_to_str import module_build_service.resolver as mbs_resolver -from module_build_service.db_session import db_session +from module_build_service.scheduler.db_session import db_session from module_build_service.models import ModuleBuild import tests diff --git a/tests/test_resolver/test_mbs.py b/tests/test_resolver/test_mbs.py index d21b1955..d2f922a5 100644 --- a/tests/test_resolver/test_mbs.py +++ b/tests/test_resolver/test_mbs.py @@ -6,7 +6,7 @@ from module_build_service import app, conf from module_build_service.builder.MockModuleBuilder import load_local_builds from module_build_service.common.utils import load_mmd, mmd_to_str import module_build_service.resolver as mbs_resolver -from module_build_service.db_session import db_session +from module_build_service.scheduler.db_session import db_session import module_build_service.models import tests diff --git a/tests/test_scheduler/test_batches.py b/tests/test_scheduler/test_batches.py index b6e6c51c..4d8dc5cb 100644 --- a/tests/test_scheduler/test_batches.py +++ b/tests/test_scheduler/test_batches.py @@ -5,7 +5,7 @@ from module_build_service import models, conf import mock import koji import pytest -from module_build_service.db_session import db_session +from module_build_service.scheduler.db_session import db_session from module_build_service.builder import GenericBuilder from module_build_service.builder.KojiModuleBuilder import KojiModuleBuilder from module_build_service.scheduler import events diff --git a/tests/test_scheduler/test_default_modules.py b/tests/test_scheduler/test_default_modules.py index ee8c0312..a348c8c4 100644 --- a/tests/test_scheduler/test_default_modules.py +++ b/tests/test_scheduler/test_default_modules.py @@ -9,7 +9,7 @@ import pytest from module_build_service import conf from module_build_service.common.utils import import_mmd, load_mmd, mmd_to_str -from module_build_service.db_session import db_session +from module_build_service.scheduler.db_session import db_session from module_build_service.errors import UnprocessableEntity from module_build_service.models import ModuleBuild from module_build_service.scheduler import default_modules diff --git a/tests/test_scheduler/test_greenwave_handler.py b/tests/test_scheduler/test_greenwave_handler.py index eaf93603..60df9a8c 100644 --- a/tests/test_scheduler/test_greenwave_handler.py +++ b/tests/test_scheduler/test_greenwave_handler.py @@ -7,7 +7,7 @@ from sqlalchemy import func import module_build_service.common.config from module_build_service import conf -from module_build_service.db_session import db_session +from module_build_service.scheduler.db_session import db_session from module_build_service.models import BUILD_STATES, ModuleBuild from module_build_service.scheduler.consumer import MBSConsumer from module_build_service.scheduler.handlers.greenwave import get_corresponding_module_build diff --git a/tests/test_scheduler/test_module_init.py b/tests/test_scheduler/test_module_init.py index d8a93ef5..fef8cfed 100644 --- a/tests/test_scheduler/test_module_init.py +++ b/tests/test_scheduler/test_module_init.py @@ -10,7 +10,7 @@ from tests.test_views.test_views import FakeSCM import module_build_service.messaging import module_build_service.scheduler.handlers.modules from module_build_service import build_logs, conf -from module_build_service.db_session import db_session +from module_build_service.scheduler.db_session import db_session from module_build_service.models import ModuleBuild diff --git a/tests/test_scheduler/test_module_wait.py b/tests/test_scheduler/test_module_wait.py index 8711c605..b02d9f40 100644 --- a/tests/test_scheduler/test_module_wait.py +++ b/tests/test_scheduler/test_module_wait.py @@ -10,7 +10,7 @@ import pytest from tests import scheduler_init_data import module_build_service.resolver from module_build_service import build_logs, conf, Modulemd -from module_build_service.db_session import db_session +from module_build_service.scheduler.db_session import db_session from module_build_service.models import ComponentBuild, ModuleBuild base_dir = os.path.dirname(os.path.dirname(__file__)) diff --git a/tests/test_scheduler/test_poller.py b/tests/test_scheduler/test_poller.py index 92a657cb..e5609f15 100644 --- a/tests/test_scheduler/test_poller.py +++ b/tests/test_scheduler/test_poller.py @@ -7,7 +7,7 @@ from module_build_service import models, conf from tests import clean_database, make_module_in_db import mock import koji -from module_build_service.db_session import db_session +from module_build_service.scheduler.db_session import db_session from module_build_service.scheduler import producer from datetime import datetime, timedelta diff --git a/tests/test_scheduler/test_repo_done.py b/tests/test_scheduler/test_repo_done.py index beefe774..585ab287 100644 --- a/tests/test_scheduler/test_repo_done.py +++ b/tests/test_scheduler/test_repo_done.py @@ -5,7 +5,7 @@ import mock import module_build_service.messaging import module_build_service.scheduler.handlers.repos import module_build_service.models -from module_build_service.db_session import db_session +from module_build_service.scheduler.db_session import db_session from module_build_service.models import ComponentBuild from tests import scheduler_init_data diff --git a/tests/test_scheduler/test_reuse.py b/tests/test_scheduler/test_reuse.py index e9fa3f0c..4556d075 100644 --- a/tests/test_scheduler/test_reuse.py +++ b/tests/test_scheduler/test_reuse.py @@ -6,7 +6,7 @@ from sqlalchemy.orm.session import make_transient from module_build_service import models, Modulemd from module_build_service.common.utils import import_mmd, load_mmd, mmd_to_str -from module_build_service.db_session import db_session +from module_build_service.scheduler.db_session import db_session from module_build_service.scheduler.reuse import get_reusable_component, get_reusable_module from tests import clean_database, read_staged_data diff --git a/tests/test_scheduler/test_submit.py b/tests/test_scheduler/test_submit.py index 9a701c75..9f21d9a1 100644 --- a/tests/test_scheduler/test_submit.py +++ b/tests/test_scheduler/test_submit.py @@ -6,7 +6,7 @@ import mock import pytest from module_build_service.common.utils import load_mmd, load_mmd_file, mmd_to_str -from module_build_service.db_session import db_session +from module_build_service.scheduler.db_session import db_session import module_build_service.scm from module_build_service import app, models, conf from module_build_service.errors import UnprocessableEntity diff --git a/tests/test_scheduler/test_tag_tagged.py b/tests/test_scheduler/test_tag_tagged.py index 8b7cb58b..6bd209e7 100644 --- a/tests/test_scheduler/test_tag_tagged.py +++ b/tests/test_scheduler/test_tag_tagged.py @@ -10,7 +10,7 @@ import module_build_service.scheduler.handlers.repos import module_build_service.scheduler.handlers.tags import module_build_service.models -from module_build_service.db_session import db_session +from module_build_service.scheduler.db_session import db_session import koji diff --git a/tests/test_views/test_views.py b/tests/test_views/test_views.py index dcdcf032..5d53a135 100644 --- a/tests/test_views/test_views.py +++ b/tests/test_views/test_views.py @@ -29,7 +29,7 @@ from tests import ( time_assert, ) from tests.test_scm import base_dir as scm_base_dir -from module_build_service.db_session import db_session +from module_build_service.scheduler.db_session import db_session from module_build_service.errors import UnprocessableEntity from module_build_service.models import ModuleBuild, BUILD_STATES, ComponentBuild from module_build_service import app, version diff --git a/tests/test_web/test_mse.py b/tests/test_web/test_mse.py index d2729fbb..0e94ad4e 100644 --- a/tests/test_web/test_mse.py +++ b/tests/test_web/test_mse.py @@ -2,7 +2,7 @@ # SPDX-License-Identifier: MIT import pytest -from module_build_service.db_session import db_session +from module_build_service.scheduler.db_session import db_session from module_build_service.errors import StreamAmbigous from module_build_service.web.mse import ( expand_mse_streams, generate_expanded_mmds, get_mmds_required_by_module_recursively diff --git a/tests/test_web/test_submit.py b/tests/test_web/test_submit.py index b52d5f9f..5bcb9838 100644 --- a/tests/test_web/test_submit.py +++ b/tests/test_web/test_submit.py @@ -11,7 +11,7 @@ from werkzeug.datastructures import FileStorage from module_build_service import models from module_build_service.common.utils import mmd_to_str -from module_build_service.db_session import db_session +from module_build_service.scheduler.db_session import db_session from module_build_service.errors import ValidationError from module_build_service.web.submit import ( get_prefixed_version, submit_module_build, submit_module_build_from_yaml