[resotocore][fix] package need to be marked as module (#880)

someengineering · May 20, 2022 · 80cc046 · 80cc046
1 parent 0fdbfc7
commit 80cc046
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 20 deletions.
diff --git a/resotocore/resotocore/action_handlers/__init__.py b/resotocore/resotocore/action_handlers/__init__.py
diff --git a/resotocore/tests/resotocore/action_handlers/merge_outer_edge_handler_test.py b/resotocore/tests/resotocore/action_handlers/merge_outer_edge_handler_test.py
@@ -1,26 +1,17 @@
 import pytest
 import asyncio
 from pytest import fixture
-from tests.resotocore.task.task_handler_test import task_handler
+
 from resotocore.action_handlers.merge_outer_edge_handler import MergeOuterEdgesHandler
 from resotocore.message_bus import Action, MessageBus
 from resotocore.task.task_handler import TaskHandlerService
 from resotocore.task.subscribers import SubscriptionHandler
-from tests.resotocore.message_bus_test import message_bus, all_events, wait_for_message
-from tests.resotocore.db.runningtaskdb_test import running_task_db
 from typing import AsyncGenerator
-from resotocore.task.task_description import (
-    Workflow,
-    Step,
-    PerformAction,
-    EventTrigger,
-    StepErrorBehaviour,
-    TimeTrigger,
-    Job,
-    TaskSurpassBehaviour,
-    ExecuteCommand,
-)
 
+# noinspection PyUnresolvedReferences
+from tests.resotocore.task.task_handler_test import task_handler
+
+# noinspection PyUnresolvedReferences
 from tests.resotocore.db.graphdb_test import (
     filled_graph_db,
     graph_db,
@@ -31,6 +22,12 @@
     local_client,
 )
 
+# noinspection PyUnresolvedReferences
+from tests.resotocore.db.runningtaskdb_test import running_task_db
+
+# noinspection PyUnresolvedReferences
+from tests.resotocore.message_bus_test import message_bus, all_events, wait_for_message
+
 # noinspection PyUnresolvedReferences
 from tests.resotocore.cli.cli_test import cli, cli_deps
 
@@ -45,7 +42,6 @@
 
 # noinspection PyUnresolvedReferences
 from tests.resotocore.config.config_handler_service_test import config_handler
-from tests.resotocore.db.entitydb import InMemoryDb
 
 # noinspection PyUnresolvedReferences
 from tests.resotocore.web.certificate_handler_test import cert_handler
@@ -56,9 +52,7 @@
 
 @fixture()
 async def merge_handler(
-    message_bus: MessageBus,
-    subscription_handler: SubscriptionHandler,
-    task_handler: TaskHandlerService,
+    message_bus: MessageBus, subscription_handler: SubscriptionHandler, task_handler: TaskHandlerService
 ) -> AsyncGenerator[MergeOuterEdgesHandler, None]:
     handler = MergeOuterEdgesHandler(message_bus, subscription_handler, task_handler)
     await handler.start()
@@ -78,10 +72,12 @@ async def test_handler_invocation(
 ) -> None:
     merge_called: asyncio.Future[str] = asyncio.get_event_loop().create_future()
 
-    def mocked_merge(self: MergeOuterEdgesHandler, task_id: str) -> None:
+    def mocked_merge(task_id: str) -> None:
         merge_called.set_result(task_id)
 
-    merge_handler.merge_outer_edges = lambda task_id: mocked_merge(merge_handler, task_id)
+    # monkey patching the merge_outer_edges method
+    # use setattr here, since assignment does not work in mypy https://github.com/python/mypy/issues/2427
+    setattr(merge_handler, "merge_outer_edges", mocked_merge)
 
     subscribers = await subscription_handler.list_subscriber_for(merge_outer_edges)