From 18bb36f80700ca9638bb14fc4a3dceeeb527775f Mon Sep 17 00:00:00 2001 From: Max Marrone Date: Wed, 11 Oct 2023 16:31:12 -0400 Subject: [PATCH] slots slots slots slotsslotsslots everybooody --- api/src/opentrons/protocol_api/core/engine/stringify.py | 4 ++-- .../opentrons/protocol_api/core/engine/test_stringify.py | 2 +- api/tests/opentrons/test_execute.py | 8 ++++---- api/tests/opentrons/test_simulate.py | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/api/src/opentrons/protocol_api/core/engine/stringify.py b/api/src/opentrons/protocol_api/core/engine/stringify.py index 6d191b7fe69..fd4a90817cd 100644 --- a/api/src/opentrons/protocol_api/core/engine/stringify.py +++ b/api/src/opentrons/protocol_api/core/engine/stringify.py @@ -20,9 +20,9 @@ def _labware_location_string( engine_client: SyncClient, location: LabwareLocation ) -> str: if isinstance(location, DeckSlotLocation): - # Returning just the ID, like "5" or "C2", matches historical behavior. + # TODO(mm, 2023-10-11): # Ideally, we might want to use the display name specified by the deck definition? - return location.slotName.id + return f"slot {location.slotName.id}" elif isinstance(location, ModuleLocation): module_name = engine_client.state.modules.get_definition( diff --git a/api/tests/opentrons/protocol_api/core/engine/test_stringify.py b/api/tests/opentrons/protocol_api/core/engine/test_stringify.py index 30096c88a8f..2ba44a36b97 100644 --- a/api/tests/opentrons/protocol_api/core/engine/test_stringify.py +++ b/api/tests/opentrons/protocol_api/core/engine/test_stringify.py @@ -104,5 +104,5 @@ def test_well_on_labware_with_complicated_location(decoy: Decoy) -> None: ) assert ( result - == "well-name of lw-1-display-name on lw-2-display-name on module-display-name on C2" + == "well-name of lw-1-display-name on lw-2-display-name on module-display-name on slot C2" ) diff --git a/api/tests/opentrons/test_execute.py b/api/tests/opentrons/test_execute.py index 475917637f1..2cfbb940618 100644 --- a/api/tests/opentrons/test_execute.py +++ b/api/tests/opentrons/test_execute.py @@ -74,10 +74,10 @@ async def dummy_delay(self: Any, duration_s: float) -> None: ( "testosaur_v2_14.py", [ - "Picking up tip from A1 of Opentrons 96 Tip Rack 1000 µL on 1", - "Aspirating 100.0 uL from A1 of Corning 96 Well Plate 360 µL Flat on 2 at 500.0 uL/sec", - "Dispensing 100.0 uL into B1 of Corning 96 Well Plate 360 µL Flat on 2 at 1000.0 uL/sec", - "Dropping tip into H12 of Opentrons 96 Tip Rack 1000 µL on 1", + "Picking up tip from A1 of Opentrons 96 Tip Rack 1000 µL on slot 1", + "Aspirating 100.0 uL from A1 of Corning 96 Well Plate 360 µL Flat on slot 2 at 500.0 uL/sec", + "Dispensing 100.0 uL into B1 of Corning 96 Well Plate 360 µL Flat on slot 2 at 1000.0 uL/sec", + "Dropping tip into H12 of Opentrons 96 Tip Rack 1000 µL on slot 1", ], ), ], diff --git a/api/tests/opentrons/test_simulate.py b/api/tests/opentrons/test_simulate.py index 4f53e81e409..c1a9cb08e74 100644 --- a/api/tests/opentrons/test_simulate.py +++ b/api/tests/opentrons/test_simulate.py @@ -83,10 +83,10 @@ def test_simulate_without_filename(protocol: Protocol, protocol_file: str) -> No ( "testosaur_v2_14.py", [ - "Picking up tip from A1 of Opentrons 96 Tip Rack 1000 µL on 1", - "Aspirating 100.0 uL from A1 of Corning 96 Well Plate 360 µL Flat on 2 at 500.0 uL/sec", - "Dispensing 100.0 uL into B1 of Corning 96 Well Plate 360 µL Flat on 2 at 1000.0 uL/sec", - "Dropping tip into H12 of Opentrons 96 Tip Rack 1000 µL on 1", + "Picking up tip from A1 of Opentrons 96 Tip Rack 1000 µL on slot 1", + "Aspirating 100.0 uL from A1 of Corning 96 Well Plate 360 µL Flat on slot 2 at 500.0 uL/sec", + "Dispensing 100.0 uL into B1 of Corning 96 Well Plate 360 µL Flat on slot 2 at 1000.0 uL/sec", + "Dropping tip into H12 of Opentrons 96 Tip Rack 1000 µL on slot 1", ], ), ],