refactor(scans): renamed primary to monitored

debye_bec/scans/mono_bragg_scans.py

@@ -89,7 +89,7 @@ class XASSimpleScan(AsyncFlyScanBase):
 
         while not complete_status.done:
             # Readout monitored devices
-            yield from self.stubs.read(group="primary", point_id=self.point_id)
+            yield from self.stubs.read(group="monitored", point_id=self.point_id)
             time.sleep(self.primary_readout_cycle)
             self.point_id += 1
 

tests/tests_scans/conftest.py

@@ -1,11 +1,13 @@
 # pylint: skip-file
 from functools import partial
-from unittest import mock
 
 import pytest
-from bec_lib.tests.utils import ConnectorMock
 from bec_server.device_server.tests.utils import DeviceMockType, DMMock
-from bec_server.scan_server.instruction_handler import InstructionHandler
+from bec_server.scan_server.tests.fixtures import (
+    ScanStubStatusMock,
+    connector_mock,
+    instruction_handler_mock,
+)
 
 
 @pytest.fixture
@@ -22,36 +24,6 @@ def device_manager_mock():
     yield device_manager
 
 
-@pytest.fixture
-def connector_mock():
-    connector = ConnectorMock("")
-    yield connector
-
-
-class _ScanStubStatusMock:
-    def __init__(self, done_func) -> None:
-        self._done = done_func()
-
-    @property
-    def done(self):
-        return next(self._done)
-
-    def wait(self):
-        return
-
-
-@pytest.fixture
-def ScanStubStatusMock():
-    return _ScanStubStatusMock
-
-
-@pytest.fixture
-def instruction_handler_mock(connector_mock):
-    instruction_handler = InstructionHandler(connector_mock)
-    with mock.patch("bec_server.scan_server.scan_stubs.ScanStubStatus.wait", return_value=None):
-        yield instruction_handler
-
-
 @pytest.fixture
 def scan_assembler(instruction_handler_mock, device_manager_mock):
     def _assemble_scan(scan_class, *args, **kwargs):

tests/tests_scans/test_mono_bragg_scans.py

@@ -113,13 +113,13 @@ def test_xas_simple_scan(scan_assembler, ScanStubStatusMock):
             metadata={"readout_priority": "monitored", "RID": "my_test_request_id", "point_id": 0},
             device=["bpm4i", "eiger", "mo1_bragg"],
             action="read",
-            parameter={"group": "primary"},
+            parameter={"group": "monitored"},
         ),
         DeviceInstructionMessage(
             metadata={"readout_priority": "monitored", "RID": "my_test_request_id", "point_id": 1},
             device=["bpm4i", "eiger", "mo1_bragg"],
             action="read",
-            parameter={"group": "primary"},
+            parameter={"group": "monitored"},
         ),
         "fake_complete",
         DeviceInstructionMessage(
@@ -218,13 +218,13 @@ def test_xas_simple_scan_with_xrd(scan_assembler, ScanStubStatusMock):
             metadata={"readout_priority": "monitored", "RID": "my_test_request_id", "point_id": 0},
             device=["bpm4i", "eiger", "mo1_bragg"],
             action="read",
-            parameter={"group": "primary"},
+            parameter={"group": "monitored"},
         ),
         DeviceInstructionMessage(
             metadata={"readout_priority": "monitored", "RID": "my_test_request_id", "point_id": 1},
             device=["bpm4i", "eiger", "mo1_bragg"],
             action="read",
-            parameter={"group": "primary"},
+            parameter={"group": "monitored"},
         ),
         "fake_complete",
         DeviceInstructionMessage(
@@ -317,13 +317,13 @@ def test_xas_advanced_scan(scan_assembler, ScanStubStatusMock):
             metadata={"readout_priority": "monitored", "RID": "my_test_request_id", "point_id": 0},
             device=["bpm4i", "eiger", "mo1_bragg"],
             action="read",
-            parameter={"group": "primary"},
+            parameter={"group": "monitored"},
         ),
         DeviceInstructionMessage(
             metadata={"readout_priority": "monitored", "RID": "my_test_request_id", "point_id": 1},
             device=["bpm4i", "eiger", "mo1_bragg"],
             action="read",
-            parameter={"group": "primary"},
+            parameter={"group": "monitored"},
         ),
         "fake_complete",
         DeviceInstructionMessage(
@@ -424,13 +424,13 @@ def test_xas_advanced_scan_with_xrd(scan_assembler, ScanStubStatusMock):
             metadata={"readout_priority": "monitored", "RID": "my_test_request_id", "point_id": 0},
             device=["bpm4i", "eiger", "mo1_bragg"],
             action="read",
-            parameter={"group": "primary"},
+            parameter={"group": "monitored"},
         ),
         DeviceInstructionMessage(
             metadata={"readout_priority": "monitored", "RID": "my_test_request_id", "point_id": 1},
             device=["bpm4i", "eiger", "mo1_bragg"],
             action="read",
-            parameter={"group": "primary"},
+            parameter={"group": "monitored"},
         ),
         "fake_complete",
         DeviceInstructionMessage(