Updated pressure cell unit tests and lint fixes.

DiamondLightSource · Feb 7, 2025 · 6c70538 · 6c70538
1 parent ebe526f
commit 6c70538
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 17 deletions.
diff --git a/src/dodal/beamlines/p38.py b/src/dodal/beamlines/p38.py
@@ -342,7 +342,7 @@ def high_pressure_xray_cell(
     return device_instantiation(
         PressureJumpCell,
         "high_pressure_xray_cell",
-        f"-EA",
+        "-EA",
         wait_for_connection,
         fake_with_ophyd_sim,
         cell_prefix="-HPXC-01:",

diff --git a/src/dodal/devices/pressure_jump_cell.py b/src/dodal/devices/pressure_jump_cell.py
@@ -178,7 +178,9 @@ def __init__(self, prefix: str, name: str = "") -> None:
 
         super().__init__(name)
 
-    def set(self, request: FastValveControlRequest | ValveOpenSeqRequest) -> AsyncStatus:
+    def set(
+        self, request: FastValveControlRequest | ValveOpenSeqRequest
+    ) -> AsyncStatus:
         set_status = None
 
         if isinstance(request, FastValveControlRequest):
@@ -229,7 +231,9 @@ def __init__(
             self.omron_pressure = epics_signal_r(
                 float, f"{final_prefix}PP{transducer_number}:PRES"
             )
-            self.omron_voltage = epics_signal_r(float, f"{final_prefix}PP{transducer_number}:RAW")
+            self.omron_voltage = epics_signal_r(
+                float, f"{final_prefix}PP{transducer_number}:RAW"
+            )
             self.beckhoff_pressure = epics_signal_r(
                 float, f"{final_prefix}STATP{transducer_number}:MeanValue_RBV"
             )

diff --git a/tests/devices/unit_tests/test_pressure_jump_cell.py b/tests/devices/unit_tests/test_pressure_jump_cell.py
@@ -74,10 +74,12 @@ async def test_reading_pjumpcell_includes_config_fields_valves(
         cell.all_valves_control.valve_control[3].close, ValveControlRequest.OPEN
     )
     set_mock_value(
-        cell.all_valves_control.valve_control[1].open, ValveOpenSeqRequest.INACTIVE
+        cell.all_valves_control.valve_control[1].open,
+        ValveOpenSeqRequest.INACTIVE.value,
     )
     set_mock_value(
-        cell.all_valves_control.valve_control[3].open, ValveOpenSeqRequest.OPEN_SEQ
+        cell.all_valves_control.valve_control[3].open,
+        ValveOpenSeqRequest.OPEN_SEQ.value,
     )
 
     set_mock_value(
@@ -89,22 +91,23 @@ async def test_reading_pjumpcell_includes_config_fields_valves(
     )
     set_mock_value(
         cell.all_valves_control.fast_valve_control[5].open,
-        ValveOpenSeqRequest.INACTIVE,
+        ValveOpenSeqRequest.INACTIVE.value,
     )
     set_mock_value(
-        cell.all_valves_control.fast_valve_control[6].open, ValveOpenSeqRequest.OPEN_SEQ
+        cell.all_valves_control.fast_valve_control[6].open,
+        ValveOpenSeqRequest.OPEN_SEQ.value,
     )
 
     await assert_reading(
         cell.all_valves_control.valve_control[1],
         {
-            "pjump-all_valves_control-valve_control-1-close": {
-                "value": ValveControlRequest.CLOSE,
+            "pjump-all_valves_control-valve_control-1-open": {
+                "value": int(ValveOpenSeqRequest.INACTIVE.value),
                 "timestamp": ANY,
                 "alarm_severity": 0,
             },
-            "pjump-all_valves_control-valve_control-1-open": {
-                "value": ValveOpenSeqRequest.INACTIVE,
+            "pjump-all_valves_control-valve_control-1-close": {
+                "value": ValveControlRequest.CLOSE,
                 "timestamp": ANY,
                 "alarm_severity": 0,
             },
@@ -120,7 +123,8 @@ async def test_pjumpcell_set_valve_sets_valve_fields(
         cell.all_valves_control.valve_control[1].close, ValveControlRequest.RESET
     )
     set_mock_value(
-        cell.all_valves_control.valve_control[1].open, ValveOpenSeqRequest.INACTIVE
+        cell.all_valves_control.valve_control[1].open,
+        ValveOpenSeqRequest.INACTIVE.value,
     )
 
     set_mock_value(
@@ -129,7 +133,8 @@ async def test_pjumpcell_set_valve_sets_valve_fields(
     )
 
     set_mock_value(
-        cell.all_valves_control.fast_valve_control[6].open, ValveOpenSeqRequest.INACTIVE
+        cell.all_valves_control.fast_valve_control[6].open,
+        ValveOpenSeqRequest.INACTIVE.value,
     )
 
     # Set new values
@@ -146,7 +151,7 @@ async def test_pjumpcell_set_valve_sets_valve_fields(
             cell.all_valves_control.valve_control[1],
             {
                 "pjump-all_valves_control-valve_control-1-open": {
-                    "value": ValveOpenSeqRequest.OPEN_SEQ,
+                    "value": int(ValveOpenSeqRequest.OPEN_SEQ.value),
                     "timestamp": ANY,
                     "alarm_severity": 0,
                 },
@@ -161,7 +166,7 @@ async def test_pjumpcell_set_valve_sets_valve_fields(
             cell.all_valves_control.fast_valve_control[6],
             {
                 "pjump-all_valves_control-fast_valve_control-6-open": {
-                    "value": ValveOpenSeqRequest.OPEN_SEQ,
+                    "value": int(ValveOpenSeqRequest.OPEN_SEQ.value),
                     "timestamp": ANY,
                     "alarm_severity": 0,
                 },
@@ -180,7 +185,7 @@ async def test_pjumpcell_set_valve_sets_valve_fields(
         cell.all_valves_control.valve_control[1],
         {
             "pjump-all_valves_control-valve_control-1-open": {
-                "value": ValveOpenSeqRequest.INACTIVE,
+                "value": int(ValveOpenSeqRequest.INACTIVE.value),
                 "timestamp": ANY,
                 "alarm_severity": 0,
             },
@@ -203,7 +208,7 @@ async def test_pjumpcell_set_valve_sets_valve_fields(
                 "alarm_severity": 0,
             },
             "pjump-all_valves_control-fast_valve_control-6-open": {
-                "value": ValveOpenSeqRequest.INACTIVE,
+                "value": int(ValveOpenSeqRequest.INACTIVE.value),
                 "timestamp": ANY,
                 "alarm_severity": 0,
             },