fixed mypy tox errors

DiamondLightSource · Jul 18, 2023 · effc3ff · effc3ff
1 parent 4d766f7
commit effc3ff
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/tests/core/management/schedulers/test_base_scheduler.py b/tests/core/management/schedulers/test_base_scheduler.py
@@ -77,7 +77,7 @@ async def test_base_scheduler_update_component_method(
         ComponentID("foo"), SimTime(0), Changes(Map({PortID("42"): "hello"}))
     )
     await base_scheduler.update_component(_input)
-    base_scheduler.state_producer.produce.assert_awaited_once()
+    base_scheduler.state_producer.produce.assert_awaited_once()  # type: ignore
 
 
 @pytest.mark.asyncio

diff --git a/tests/integration_tests/test_with_master.py b/tests/integration_tests/test_with_master.py
@@ -16,7 +16,7 @@
 from tickit.core.management.schedulers.master import MasterScheduler
 from tickit.core.runner import run_all_forever
 from tickit.core.state_interfaces.state_interface import get_interface
-from tickit.core.typedefs import ComponentException
+from tickit.core.typedefs import ComponentException, ComponentID, PortID
 from tickit.devices.sink import SinkDevice
 from tickit.utils.configuration.loading import read_configs
 
@@ -64,7 +64,9 @@ async def master_scheduler(
 
     exception_task = event_loop.create_task(
         scheduler.handle_component_exception(
-            ComponentException(source="sim", error=NotImplementedError, traceback="")
+            ComponentException(
+                source=ComponentID("sim"), error=Exception(), traceback=""
+            )
         )
     )
 
@@ -84,8 +86,8 @@ async def test_sink_has_captured_value(
 
     await asyncio.wait_for(master_scheduler.ticker.finished.wait(), timeout=2.0)
 
-    sunk_value = master_scheduler.ticker.inputs["sink"]
+    sunk_value = master_scheduler.ticker.inputs[ComponentID("sink")]
 
     mocked_update = cast(mock.MagicMock, sink.device.update)
     mocked_update.assert_called_once_with(0, sunk_value)
-    assert sunk_value.get("input") == 42
+    assert sunk_value.get(PortID("input")) == 42
diff --git a/tests/integration_tests/test_with_master_and_slave.py b/tests/integration_tests/test_with_master_and_slave.py
@@ -15,7 +15,7 @@
 from tickit.core.management.schedulers.master import MasterScheduler
 from tickit.core.runner import run_all_forever
 from tickit.core.state_interfaces.state_interface import get_interface
-from tickit.core.typedefs import ComponentException
+from tickit.core.typedefs import ComponentException, ComponentID, PortID
 from tickit.utils.configuration.loading import read_configs
 
 
@@ -70,12 +70,12 @@ async def master_scheduler(
     exception_task = event_loop.create_task(
         scheduler.handle_component_exception(
             ComponentException(
-                source="internal_tickit", error=NotImplementedError, traceback=""
+                source=ComponentID("internal_tickit"), error=Exception(), traceback=""
             ),
         )
     )
     interrupt_task = event_loop.create_task(
-        scheduler.schedule_interrupt("external_sink")
+        scheduler.schedule_interrupt(ComponentID("external_sink"))
     )
 
     await asyncio.wait([run_task, exception_task, interrupt_task])
@@ -98,5 +98,9 @@ async def test_sink_has_captured_value(
     await asyncio.wait_for(master_scheduler.running.wait(), timeout=2.0)
     await asyncio.wait_for(master_scheduler.ticker.finished.wait(), timeout=3.0)
 
-    assert source.last_outputs["value"] == sim.scheduler.input_changes["input_1"] == 42
+    assert (
+        source.last_outputs[PortID("value")]
+        == sim.scheduler.input_changes[PortID("input_1")]
+        == 42
+    )
     assert sink.device_inputs == {"sink_1": 42}