diff --git a/api/tests/opentrons/protocol_engine/commands/test_air_gap_in_place.py b/api/tests/opentrons/protocol_engine/commands/test_air_gap_in_place.py index 7664312b15e..a743355baf3 100644 --- a/api/tests/opentrons/protocol_engine/commands/test_air_gap_in_place.py +++ b/api/tests/opentrons/protocol_engine/commands/test_air_gap_in_place.py @@ -155,7 +155,7 @@ async def test_handle_air_gap_in_place_request_not_ready_to_aspirate( with pytest.raises( PipetteNotReadyToAspirateError, - match="Pipette cannot aspirate in place because of a previous blow out." + match="Pipette cannot air gap in place because of a previous blow out." " The first aspirate following a blow-out must be from a specific well" " so the plunger can be reset in a known safe position.", ): diff --git a/api/tests/opentrons/protocol_engine/state/test_pipette_store.py b/api/tests/opentrons/protocol_engine/state/test_pipette_store.py index 549b8af263e..026af05ead3 100644 --- a/api/tests/opentrons/protocol_engine/state/test_pipette_store.py +++ b/api/tests/opentrons/protocol_engine/state/test_pipette_store.py @@ -242,6 +242,7 @@ def test_handles_load_pipette( mount=MountType.LEFT, ) assert result.aspirated_volume_by_id["pipette-id"] is None + assert result.aspirated_liquid_by_id["pipette-id"] is None assert result.movement_speed_by_id["pipette-id"] is None assert result.attached_tip_by_id["pipette-id"] is None @@ -291,6 +292,7 @@ def test_handles_pick_up_and_drop_tip(subject: PipetteStore) -> None: volume=42, length=101, diameter=8.0 ) assert subject.state.aspirated_volume_by_id["abc"] == 0 + assert subject.state.aspirated_liquid_by_id["abc"] == 0 subject.handle_action( SucceedCommandAction( @@ -304,6 +306,7 @@ def test_handles_pick_up_and_drop_tip(subject: PipetteStore) -> None: ) assert subject.state.attached_tip_by_id["abc"] is None assert subject.state.aspirated_volume_by_id["abc"] is None + assert subject.state.aspirated_liquid_by_id["abc"] is None def test_handles_drop_tip_in_place(subject: PipetteStore) -> None: @@ -350,6 +353,7 @@ def test_handles_drop_tip_in_place(subject: PipetteStore) -> None: volume=42, length=101, diameter=8.0 ) assert subject.state.aspirated_volume_by_id["xyz"] == 0 + assert subject.state.aspirated_liquid_by_id["xyz"] == 0 subject.handle_action( SucceedCommandAction( @@ -363,6 +367,7 @@ def test_handles_drop_tip_in_place(subject: PipetteStore) -> None: ) assert subject.state.attached_tip_by_id["xyz"] is None assert subject.state.aspirated_volume_by_id["xyz"] is None + assert subject.state.aspirated_liquid_by_id["xyz"] is None def test_handles_unsafe_drop_tip_in_place(subject: PipetteStore) -> None: @@ -409,6 +414,7 @@ def test_handles_unsafe_drop_tip_in_place(subject: PipetteStore) -> None: volume=42, length=101, diameter=8.0 ) assert subject.state.aspirated_volume_by_id["xyz"] == 0 + assert subject.state.aspirated_liquid_by_id["xyz"] == 0 subject.handle_action( SucceedCommandAction( @@ -422,6 +428,7 @@ def test_handles_unsafe_drop_tip_in_place(subject: PipetteStore) -> None: ) assert subject.state.attached_tip_by_id["xyz"] is None assert subject.state.aspirated_volume_by_id["xyz"] is None + assert subject.state.aspirated_liquid_by_id["xyz"] is None @pytest.mark.parametrize( @@ -459,10 +466,12 @@ def test_aspirate_adds_volume( subject.handle_action(SucceedCommandAction(command=aspirate_command)) assert subject.state.aspirated_volume_by_id["pipette-id"] == 42 + assert subject.state.aspirated_liquid_by_id["pipette-id"] == 42 subject.handle_action(SucceedCommandAction(command=aspirate_command)) assert subject.state.aspirated_volume_by_id["pipette-id"] == 84 + assert subject.state.aspirated_liquid_by_id["pipette-id"] == 84 @pytest.mark.parametrize( @@ -508,10 +517,12 @@ def test_dispense_subtracts_volume( subject.handle_action(SucceedCommandAction(command=dispense_command)) assert subject.state.aspirated_volume_by_id["pipette-id"] == 21 + assert subject.state.aspirated_liquid_by_id["pipette-id"] == 21 subject.handle_action(SucceedCommandAction(command=dispense_command)) assert subject.state.aspirated_volume_by_id["pipette-id"] == 0 + assert subject.state.aspirated_liquid_by_id["pipette-id"] == 0 @pytest.mark.parametrize( @@ -554,6 +565,7 @@ def test_blow_out_clears_volume( subject.handle_action(SucceedCommandAction(command=blow_out_command)) assert subject.state.aspirated_volume_by_id["pipette-id"] is None + assert subject.state.aspirated_liquid_by_id["pipette-id"] is None def test_set_movement_speed(subject: PipetteStore) -> None: @@ -700,3 +712,4 @@ def test_prepare_to_aspirate_marks_pipette_ready( ) subject.handle_action(SucceedCommandAction(command=prepare_to_aspirate_command)) assert subject.state.aspirated_volume_by_id["pipette-id"] == 0.0 + assert subject.state.aspirated_liquid_by_id["pipette-id"] == 0.0