Move messaging.py to common/messaging.py

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

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),

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()

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

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": [

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

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

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
 
 

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

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()

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

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

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

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