Skip to content

Commit

Permalink
lint
Browse files Browse the repository at this point in the history
  • Loading branch information
stan-dot committed Nov 14, 2024
1 parent 1ed5229 commit 830fd87
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
1 change: 1 addition & 0 deletions src/dodal/beamlines/p38.py
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,7 @@ def ppump(
fake_with_ophyd_sim,
)


def high_pressure_xray_cell(
wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
) -> PressureJumpCell:
Expand Down
1 change: 1 addition & 0 deletions src/dodal/devices/pressure_jump_cell.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

OPENSEQ_PULSE_LENGTH = 0.2


class PumpState(str, Enum):
MANUAL = "Manual"
AUTO_PRESSURE = "Auto Pressure"
Expand Down
13 changes: 6 additions & 7 deletions tests/devices/unit_tests/test_pressure_jump_cell.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from unittest.mock import ANY
import asyncio
from unittest.mock import ANY

import pytest
from ophyd_async.core import DeviceCollector, assert_reading, set_mock_value

Expand Down Expand Up @@ -131,14 +132,13 @@ async def test_pjumpcell_set_valve_sets_valve_fields(
)

# Set new values

await cell.all_valves_control.set_valve(1, ValveControlRequest.CLOSE)
await cell.all_valves_control.set_valve(6, FastValveControlRequest.ARM)

await asyncio.gather(
cell.all_valves_control.set_valve(1, ValveControlRequest.OPEN),
cell.all_valves_control.set_valve(6, FastValveControlRequest.OPEN),

# Check valves requested to open are set to OPEN_SEQ on initially calling
# set_valve()
assert_reading(
Expand All @@ -153,7 +153,7 @@ async def test_pjumpcell_set_valve_sets_valve_fields(
"value": ANY,
"timestamp": ANY,
"alarm_severity": 0,
},
},
},
),
assert_reading(
Expand All @@ -168,10 +168,9 @@ async def test_pjumpcell_set_valve_sets_valve_fields(
"value": ANY,
"timestamp": ANY,
"alarm_severity": 0,
},
},
},
)

),
)

# Check slow valves have been set to the new value and valves requested to open are
Expand Down

0 comments on commit 830fd87

Please sign in to comment.