tests[wip]: fix tests

Author: shihab-dls

tests/conftest.py

@@ -47,6 +47,7 @@ def mock_connection(mocker: MockerFixture):
             IPConnectionSettings("127.0.0.1", 8081), api_version="1.8.0"
         )
     )
+    eiger_controller.state = mock.MagicMock()
     connection = mocker.patch.object(eiger_controller, "connection")
     connection.get = mock.AsyncMock()
     connection.put = mock.AsyncMock()

tests/system/test_eiger_introspection.py

@@ -274,7 +274,9 @@ async def test_attribute_validation_raises_for_invalid_type(mock_connection):
 
 @pytest.mark.asyncio
 @pytest.mark.parametrize("valid_type", EIGER_PARAMETER_VALID_VALUES)
-async def test_attribute_validation_accepts_valid_types(mock_connection, valid_type):
+async def test_attribute_validation_accepts_valid_types(
+    mocker: MockerFixture, mock_connection, valid_type
+):
     eiger_controller, connection = mock_connection
     connection.get.return_value = {
         "access_mode": "r",
@@ -283,7 +285,10 @@ async def test_attribute_validation_accepts_valid_types(mock_connection, valid_t
         "value_type": valid_type,
     }
 
-    await eiger_controller.initialise()
+    with patch.object(
+        EigerDetectorController, "state", mocker.MagicMock(), create=True
+    ):
+        await eiger_controller.initialise()
 
 
 @pytest.mark.asyncio
@@ -334,7 +339,7 @@ async def test_eiger_controller_trigger_correctly_introspected(
     ],
 )
 async def test_if_min_value_provided_then_prec_set_correctly(
-    mock_min, expected_prec, mock_connection
+    mocker: MockerFixture, mock_min, expected_prec, mock_connection
 ):
     eiger_controller, connection = mock_connection
 
@@ -365,6 +370,7 @@ async def test_if_min_value_provided_then_prec_set_correctly(
             "fastcs_eiger.controllers.eiger_subsystem_controller.EIGER_PARAMETER_MODES",
             ["status"],
         ),
+        patch.object(EigerDetectorController, "state", mocker.MagicMock(), create=True),
     ):
         await eiger_controller.initialise()
 

tests/test_eiger_controller.py

@@ -1,3 +1,5 @@
+from unittest.mock import patch
+
 import pytest
 from fastcs.attributes import AttrRW
 from pytest_mock import MockerFixture
@@ -7,7 +9,9 @@
 
 
 @pytest.mark.asyncio
-async def test_eiger_controller_creates_subcontrollers(mock_connection):
+async def test_eiger_controller_creates_subcontrollers(
+    mocker: MockerFixture, mock_connection
+):
     eiger_controller, connection = mock_connection
 
     # Arbitrary HTTP response for pydantic model.
@@ -17,8 +21,10 @@ async def test_eiger_controller_creates_subcontrollers(mock_connection):
         "value": "test_value",
         "value_type": "string",
     }
-
-    await eiger_controller.initialise()
+    with patch.object(
+        EigerDetectorController, "state", mocker.MagicMock(), create=True
+    ):
+        await eiger_controller.initialise()
     assert list(eiger_controller.sub_controllers.keys()) == [
         "detector",
         "stream",

tests/test_eiger_odin_controller.py

@@ -38,6 +38,9 @@ def eiger_odin_controller(mocker: MockerFixture):
     fp_mock.data_dims_1 = AttrR(Int(), initial_value=1024)
     fp_mock.start_writing = mocker.AsyncMock()
 
+    mw_mock = mocker.patch.object(controller.OD, "MW", create=True)
+    mw_mock.acquisition_id.put = mocker.AsyncMock()
+
     return controller