From 4c76d5f7afecea11c9dd4603a392fb8839f4c6de Mon Sep 17 00:00:00 2001 From: Sanniti Pimpley Date: Wed, 13 Dec 2023 14:52:15 -0500 Subject: [PATCH] fix(api): use adapter labwareId when checking adapter quirk (#14191) --- api/src/opentrons/protocol_api/core/engine/deck_conflict.py | 2 +- .../opentrons/protocol_api/core/engine/test_deck_conflict.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/src/opentrons/protocol_api/core/engine/deck_conflict.py b/api/src/opentrons/protocol_api/core/engine/deck_conflict.py index 8afeec4c294..7ef2cfcbeac 100644 --- a/api/src/opentrons/protocol_api/core/engine/deck_conflict.py +++ b/api/src/opentrons/protocol_api/core/engine/deck_conflict.py @@ -213,7 +213,7 @@ def check_safe_for_tip_pickup_and_return( tiprack_parent = engine_state.labware.get_location(labware_id) if isinstance(tiprack_parent, OnLabwareLocation): # tiprack is on an adapter is_96_ch_tiprack_adapter = engine_state.labware.get_has_quirk( - labware_id=labware_id, quirk="tiprackAdapterFor96Channel" + labware_id=tiprack_parent.labwareId, quirk="tiprackAdapterFor96Channel" ) tiprack_height = engine_state.labware.get_dimensions(labware_id).z adapter_height = engine_state.labware.get_dimensions(tiprack_parent.labwareId).z diff --git a/api/tests/opentrons/protocol_api/core/engine/test_deck_conflict.py b/api/tests/opentrons/protocol_api/core/engine/test_deck_conflict.py index 952e0177910..4be7e503bf0 100644 --- a/api/tests/opentrons/protocol_api/core/engine/test_deck_conflict.py +++ b/api/tests/opentrons/protocol_api/core/engine/test_deck_conflict.py @@ -579,7 +579,7 @@ def test_valid_96_pipette_movement_for_tiprack_and_adapter( ) decoy.when( mock_state_view.labware.get_has_quirk( - labware_id="labware-id", quirk="tiprackAdapterFor96Channel" + labware_id="adapter-id", quirk="tiprackAdapterFor96Channel" ) ).then_return(is_on_flex_adapter)