REF: Move ServicePatcher into its own module

octue/cloud/emulators/child.py

@@ -1,11 +1,8 @@
 import json
 import logging
 import warnings
-from unittest.mock import patch
 
-from octue.cloud.emulators._pub_sub import MockSubscriber, MockSubscription, MockTopic
 from octue.cloud.events.replayer import EventReplayer
-from octue.utils.patches import MultiPatcher
 
 
 logger = logging.getLogger(__name__)
@@ -109,20 +106,3 @@ def ask(
         event_replayer = EventReplayer(handle_monitor_message=handle_monitor_message, record_events=record_events)
         result = event_replayer.handle_events(self.events)
         return (result, self.events[0].get("attributes", {}).get("question_uuid"))
-
-
-class ServicePatcher(MultiPatcher):
-    """A multi-patcher that provides the patches needed to run mock services.
-
-    :return None:
-    """
-
-    def __init__(self):
-        super().__init__(
-            patches=[
-                patch("octue.cloud.pub_sub.service.Topic", new=MockTopic),
-                patch("octue.cloud.pub_sub.service.Subscription", new=MockSubscription),
-                patch("octue.cloud.pub_sub.events.SubscriberClient", new=MockSubscriber),
-                patch("google.cloud.pubsub_v1.SubscriberClient", new=MockSubscriber),
-            ]
-        )

octue/cloud/emulators/service.py

@@ -0,0 +1,21 @@
+from unittest.mock import patch
+
+from octue.cloud.emulators._pub_sub import MockSubscriber, MockSubscription, MockTopic
+from octue.utils.patches import MultiPatcher
+
+
+class ServicePatcher(MultiPatcher):
+    """A multi-patcher that provides the patches needed to run mock services.
+
+    :return None:
+    """
+
+    def __init__(self):
+        super().__init__(
+            patches=[
+                patch("octue.cloud.pub_sub.service.Topic", new=MockTopic),
+                patch("octue.cloud.pub_sub.service.Subscription", new=MockSubscription),
+                patch("octue.cloud.pub_sub.events.SubscriberClient", new=MockSubscriber),
+                patch("google.cloud.pubsub_v1.SubscriberClient", new=MockSubscriber),
+            ]
+        )

tests/base.py

@@ -6,8 +6,8 @@
 
 from octue.cloud import storage
 from octue.cloud.emulators._pub_sub import MockTopic
-from octue.cloud.emulators.child import ServicePatcher
 from octue.cloud.emulators.cloud_storage import GoogleCloudStorageEmulatorTestResultModifier
+from octue.cloud.emulators.service import ServicePatcher
 from octue.cloud.events import OCTUE_SERVICES_PREFIX
 from octue.cloud.storage import GoogleCloudStorageClient
 from octue.resources import Datafile, Dataset, Manifest

tests/cloud/emulators/test_child_emulator.py

@@ -2,7 +2,8 @@
 import os
 
 from octue.cloud.emulators._pub_sub import MockService
-from octue.cloud.emulators.child import ChildEmulator, ServicePatcher
+from octue.cloud.emulators.child import ChildEmulator
+from octue.cloud.emulators.service import ServicePatcher
 from octue.resources.service_backends import GCPPubSubBackend
 from tests import TESTS_DIR
 from tests.base import BaseTestCase

tests/cloud/pub_sub/test_events.py

@@ -3,7 +3,7 @@
 from unittest.mock import patch
 
 from octue.cloud.emulators._pub_sub import MESSAGES, MockMessage, MockService, MockSubscription
-from octue.cloud.emulators.child import ServicePatcher
+from octue.cloud.emulators.service import ServicePatcher
 from octue.cloud.pub_sub.events import GoogleCloudPubSubEventHandler
 from octue.resources.service_backends import GCPPubSubBackend
 from tests import TEST_PROJECT_NAME

tests/cloud/pub_sub/test_logging.py

@@ -4,7 +4,7 @@
 from unittest.mock import patch
 
 from octue.cloud.emulators._pub_sub import MESSAGES, MockService
-from octue.cloud.emulators.child import ServicePatcher
+from octue.cloud.emulators.service import ServicePatcher
 from octue.cloud.pub_sub.logging import GoogleCloudPubSubHandler
 from octue.resources.service_backends import GCPPubSubBackend
 from tests.base import BaseTestCase

tests/cloud/pub_sub/test_service.py

@@ -19,8 +19,8 @@
     MockSubscription,
     MockTopic,
 )
-from octue.cloud.emulators.child import ServicePatcher
 from octue.cloud.emulators.cloud_storage import mock_generate_signed_url
+from octue.cloud.emulators.service import ServicePatcher
 from octue.cloud.pub_sub.service import Service
 from octue.exceptions import InvalidMonitorMessage
 from octue.resources import Analysis, Datafile, Dataset, Manifest

tests/resources/test_child.py

@@ -10,7 +10,7 @@
 from google.auth.exceptions import DefaultCredentialsError
 
 from octue.cloud.emulators._pub_sub import MockAnalysis, MockService
-from octue.cloud.emulators.child import ServicePatcher
+from octue.cloud.emulators.service import ServicePatcher
 from octue.resources.child import Child
 from octue.resources.service_backends import GCPPubSubBackend
 from tests import MOCK_SERVICE_REVISION_TAG

tests/test_cli.py

@@ -10,7 +10,7 @@
 from octue.cli import octue_cli
 from octue.cloud import storage
 from octue.cloud.emulators._pub_sub import MockService, MockSubscription, MockTopic
-from octue.cloud.emulators.child import ServicePatcher
+from octue.cloud.emulators.service import ServicePatcher
 from octue.cloud.events import OCTUE_SERVICES_PREFIX
 from octue.cloud.pub_sub import Topic
 from octue.configuration import AppConfiguration, ServiceConfiguration