Skip to content

Commit

Permalink
fixup some things from the rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
ryanthecoder committed Nov 23, 2024
1 parent 4fcf8ab commit 942197d
Show file tree
Hide file tree
Showing 5 changed files with 880 additions and 265 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -586,4 +586,3 @@ def liquid_probe_without_recovery(

def _pressure_supported_by_pipette(self) -> bool:
return False

Original file line number Diff line number Diff line change
Expand Up @@ -1300,6 +1300,7 @@ def test_grip_error_detection(
hard_min,
)


@pytest.mark.parametrize(
argnames=["axes", "pipette_has_sensor"],
argvalues=[[[Axis.P_L, Axis.P_R], True], [[Axis.P_L, Axis.P_R], False]],
Expand All @@ -1311,7 +1312,7 @@ async def test_pressure_disable(
mock_check_overpressure: None,
pipette_has_sensor: bool,
) -> None:
config = {"run.side_effect": move_group_run_side_effect_home(controller, axes)}
config = {"run.side_effect": move_group_run_side_effect(controller, axes)}
with mock.patch( # type: ignore [call-overload]
"opentrons.hardware_control.backends.ot3controller.MoveGroupRunner",
spec=MoveGroupRunner,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -414,9 +414,6 @@ async def test_liquid_probe_plunger_preparedness_checking(
wellLocation=well_location,
)

decoy.when(
state_view.pipettes.get_nozzle_configuration_supports_lld(pipette_id)
).then_return(True)
decoy.when(state_view.pipettes.get_config("pipette-id")).then_return(
StaticPipetteConfig(
min_volume=1,
Expand Down Expand Up @@ -502,9 +499,6 @@ async def test_liquid_probe_volume_checking(
available_sensors=available_sensors,
)
)
decoy.when(
state_view.pipettes.get_nozzle_configuration_supports_lld(pipette_id)
).then_return(True)

with pytest.raises(TipNotEmptyError):
await subject.execute(data)
Expand Down Expand Up @@ -574,4 +568,3 @@ async def test_liquid_probe_location_checking(
).then_return(False)
with pytest.raises(MustHomeError):
await subject.execute(data)

Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,6 @@ def test_get_pipette_working_volume_raises_if_tip_volume_is_none(

def test_get_pipette_available_volume(
supported_tip_fixture: pipette_definition.SupportedTipsDefinition,
decoy: Decoy,
available_sensors: AvailableSensorDefinition,
) -> None:
"""It should get the available volume for a pipette."""
Expand Down
Loading

0 comments on commit 942197d

Please sign in to comment.