From c2a3b059e9934e926c74d2dda84cadfc79e0f6e1 Mon Sep 17 00:00:00 2001 From: mprahl Date: Fri, 3 Jan 2020 16:36:22 -0500 Subject: [PATCH] Move messaging.py to common/messaging.py --- module_build_service/{ => common}/messaging.py | 0 module_build_service/manage.py | 1 - module_build_service/models.py | 6 +++--- module_build_service/scheduler/consumer.py | 8 ++++---- module_build_service/scheduler/producer.py | 1 - setup.py | 4 ++-- tests/test_build/test_build.py | 1 - tests/test_builder/test_koji.py | 1 - tests/{ => test_common}/test_messaging.py | 2 +- tests/test_manage.py | 2 +- tests/test_scheduler/test_greenwave_handler.py | 2 +- tests/test_scheduler/test_module_init.py | 1 - tests/test_scheduler/test_module_wait.py | 1 - tests/test_scheduler/test_repo_done.py | 1 - tests/test_scheduler/test_tag_tagged.py | 1 - 15 files changed, 12 insertions(+), 20 deletions(-) rename module_build_service/{ => common}/messaging.py (100%) rename tests/{ => test_common}/test_messaging.py (98%) diff --git a/module_build_service/messaging.py b/module_build_service/common/messaging.py similarity index 100% rename from module_build_service/messaging.py rename to module_build_service/common/messaging.py diff --git a/module_build_service/manage.py b/module_build_service/manage.py index 66b7a5d2..b352a344 100755 --- a/module_build_service/manage.py +++ b/module_build_service/manage.py @@ -17,7 +17,6 @@ from module_build_service.builder.MockModuleBuilder import ( from module_build_service.common.utils import load_mmd_file, import_mmd 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 import module_build_service.scheduler.local from module_build_service.web.submit import submit_module_build_from_yaml diff --git a/module_build_service/models.py b/module_build_service/models.py index 588bc3bf..60ed205f 100644 --- a/module_build_service/models.py +++ b/module_build_service/models.py @@ -16,8 +16,8 @@ from sqlalchemy import func, and_ from sqlalchemy.orm import lazyload from sqlalchemy.orm import validates, load_only -import module_build_service.messaging from module_build_service import db, log, get_url_for, conf +import module_build_service.common.messaging from module_build_service.common.utils import load_mmd from module_build_service.errors import UnprocessableEntity from module_build_service.scheduler import events @@ -642,7 +642,7 @@ class ModuleBuild(MBSBase): db_session.commit() if publish_msg: - module_build_service.messaging.publish( + module_build_service.common.messaging.publish( service="mbs", topic="module.state.change", msg=module.json(db_session, show_tasks=False), # Note the state is "init" here... @@ -697,7 +697,7 @@ class ModuleBuild(MBSBase): INVERSE_BUILD_STATES[old_state], new_state_name, self) if old_state != self.state: - module_build_service.messaging.publish( + module_build_service.common.messaging.publish( service="mbs", topic="module.state.change", msg=self.json(db_session, show_tasks=False), diff --git a/module_build_service/scheduler/consumer.py b/module_build_service/scheduler/consumer.py index 5a7c48ff..d0a52464 100644 --- a/module_build_service/scheduler/consumer.py +++ b/module_build_service/scheduler/consumer.py @@ -19,13 +19,13 @@ import fedmsg.consumers import moksha.hub import sqlalchemy.exc -import module_build_service.messaging +import module_build_service.common.messaging import module_build_service.monitor as monitor from module_build_service import models, log, conf 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.common.messaging import default_messaging_backend from module_build_service.scheduler import events from module_build_service.scheduler.handlers import components from module_build_service.scheduler.handlers import repos @@ -107,8 +107,8 @@ class MBSConsumer(fedmsg.consumers.FedmsgConsumer): # Furthermore, extend our initial messages with any that were queued up # in the test environment before our hub was initialized. - while module_build_service.messaging._initial_messages: - msg = module_build_service.messaging._initial_messages.pop(0) + while module_build_service.common.messaging._initial_messages: + msg = module_build_service.common.messaging._initial_messages.pop(0) self.incoming.put(msg) self.sanity_check() diff --git a/module_build_service/scheduler/producer.py b/module_build_service/scheduler/producer.py index cad5c69f..8530e8c2 100644 --- a/module_build_service/scheduler/producer.py +++ b/module_build_service/scheduler/producer.py @@ -6,7 +6,6 @@ import operator from datetime import timedelta, datetime from sqlalchemy.orm import lazyload, load_only -import module_build_service.messaging import module_build_service.scheduler import module_build_service.scheduler.consumer from module_build_service import celery_app, conf, models, log diff --git a/setup.py b/setup.py index 752605f4..6b10577c 100644 --- a/setup.py +++ b/setup.py @@ -45,8 +45,8 @@ setup( ], "moksha.consumer": "mbsconsumer = module_build_service.scheduler.consumer:MBSConsumer", "mbs.messaging_backends": [ - "fedmsg = module_build_service.messaging:_fedmsg_backend", - "in_memory = module_build_service.messaging:_in_memory_backend", + "fedmsg = module_build_service.common.messaging:_fedmsg_backend", + "in_memory = module_build_service.common.messaging:_in_memory_backend", # 'custom = your_organization:_custom_backend', ], "mbs.builder_backends": [ diff --git a/tests/test_build/test_build.py b/tests/test_build/test_build.py index b508fe60..f4336f60 100644 --- a/tests/test_build/test_build.py +++ b/tests/test_build/test_build.py @@ -15,7 +15,6 @@ import fedmsg from module_build_service.builder.utils import get_rpm_release from module_build_service.common.utils import load_mmd, import_mmd -import module_build_service.messaging import module_build_service.scheduler.consumer import module_build_service.scheduler.handlers.repos from module_build_service.errors import Forbidden diff --git a/tests/test_builder/test_koji.py b/tests/test_builder/test_koji.py index 2eb30880..66a2c5c6 100644 --- a/tests/test_builder/test_koji.py +++ b/tests/test_builder/test_koji.py @@ -10,7 +10,6 @@ import mock from mock import patch, MagicMock import pytest -import module_build_service.messaging import module_build_service.scheduler.handlers.repos import module_build_service.models from module_build_service import conf, Modulemd diff --git a/tests/test_messaging.py b/tests/test_common/test_messaging.py similarity index 98% rename from tests/test_messaging.py rename to tests/test_common/test_messaging.py index 3aa93280..81d60e27 100644 --- a/tests/test_messaging.py +++ b/tests/test_common/test_messaging.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # SPDX-License-Identifier: MIT -from module_build_service import messaging +from module_build_service.common import messaging from module_build_service.scheduler.parser import FedmsgMessageParser diff --git a/tests/test_manage.py b/tests/test_manage.py index 38bf6048..26a79ffb 100644 --- a/tests/test_manage.py +++ b/tests/test_manage.py @@ -120,7 +120,7 @@ class TestCommandBuildModuleLocally: # The consumer is not required to run actually, so it does not make # sense to publish message after creating a module build. - self.publish_patcher = patch("module_build_service.messaging.publish") + self.publish_patcher = patch("module_build_service.common.messaging.publish") self.mock_publish = self.publish_patcher.start() # Don't allow conf.set_item call to modify conf actually inside command diff --git a/tests/test_scheduler/test_greenwave_handler.py b/tests/test_scheduler/test_greenwave_handler.py index 60df9a8c..76a83e12 100644 --- a/tests/test_scheduler/test_greenwave_handler.py +++ b/tests/test_scheduler/test_greenwave_handler.py @@ -113,7 +113,7 @@ class TestDecisionUpdateHandler: subject_identifier, ) - @patch("module_build_service.messaging.publish") + @patch("module_build_service.common.messaging.publish") @patch("koji.ClientSession") def test_transform_from_done_to_ready(self, ClientSession, publish): clean_database() diff --git a/tests/test_scheduler/test_module_init.py b/tests/test_scheduler/test_module_init.py index fef8cfed..33ede206 100644 --- a/tests/test_scheduler/test_module_init.py +++ b/tests/test_scheduler/test_module_init.py @@ -7,7 +7,6 @@ from mock import patch, PropertyMock from module_build_service.common.utils import load_mmd, mmd_to_str from tests import clean_database, read_staged_data 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.scheduler.db_session import db_session diff --git a/tests/test_scheduler/test_module_wait.py b/tests/test_scheduler/test_module_wait.py index b02d9f40..6ae8a6a7 100644 --- a/tests/test_scheduler/test_module_wait.py +++ b/tests/test_scheduler/test_module_wait.py @@ -2,7 +2,6 @@ # SPDX-License-Identifier: MIT import mock from mock import patch -import module_build_service.messaging import module_build_service.scheduler.handlers.modules import os import koji diff --git a/tests/test_scheduler/test_repo_done.py b/tests/test_scheduler/test_repo_done.py index 585ab287..92bd2892 100644 --- a/tests/test_scheduler/test_repo_done.py +++ b/tests/test_scheduler/test_repo_done.py @@ -2,7 +2,6 @@ # SPDX-License-Identifier: MIT import mock -import module_build_service.messaging import module_build_service.scheduler.handlers.repos import module_build_service.models from module_build_service.scheduler.db_session import db_session diff --git a/tests/test_scheduler/test_tag_tagged.py b/tests/test_scheduler/test_tag_tagged.py index 6bd209e7..0227ff89 100644 --- a/tests/test_scheduler/test_tag_tagged.py +++ b/tests/test_scheduler/test_tag_tagged.py @@ -5,7 +5,6 @@ import pytest from mock import patch -import module_build_service.messaging import module_build_service.scheduler.handlers.repos import module_build_service.scheduler.handlers.tags import module_build_service.models