From 69a1b0c2be3a1896d09052ef7203fdace3a83567 Mon Sep 17 00:00:00 2001 From: Jethary Date: Wed, 24 Apr 2024 16:20:24 -0400 Subject: [PATCH] fix some tests --- .../hardware_control/test_instruments.py | 4 ++-- .../resources/test_pipette_data_provider.py | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/api/tests/opentrons/hardware_control/test_instruments.py b/api/tests/opentrons/hardware_control/test_instruments.py index 7db8a5303ee..d3907451717 100644 --- a/api/tests/opentrons/hardware_control/test_instruments.py +++ b/api/tests/opentrons/hardware_control/test_instruments.py @@ -263,7 +263,7 @@ def fake_func2(mount, value): {types.Mount.LEFT: "p10_single", types.Mount.RIGHT: "p300_single_gen2"} ) attached = sim.attached_instruments - assert attached[types.Mount.LEFT]["model"] == "p10_single_v1" + assert attached[types.Mount.LEFT]["model"] == "p10_single_v1.5" assert attached[types.Mount.LEFT]["name"] == "p10_single" steps_mm_calls = [mock.call({"B": 768}), mock.call({"C": 3200})] @@ -291,7 +291,7 @@ def fake_func2(mount, value): # If we use prefixes, that should work too await sim.cache_instruments({types.Mount.RIGHT: "p300_single"}) attached = sim.attached_instruments - assert attached[types.Mount.RIGHT]["model"] == "p300_single_v1" + assert attached[types.Mount.RIGHT]["model"] == "p300_single_v1.5" assert attached[types.Mount.RIGHT]["name"] == "p300_single" # If we specify instruments at init time, we should get them without # passing an expectation diff --git a/api/tests/opentrons/protocol_engine/resources/test_pipette_data_provider.py b/api/tests/opentrons/protocol_engine/resources/test_pipette_data_provider.py index f691e8bd581..6db02ed271e 100644 --- a/api/tests/opentrons/protocol_engine/resources/test_pipette_data_provider.py +++ b/api/tests/opentrons/protocol_engine/resources/test_pipette_data_provider.py @@ -33,7 +33,7 @@ def test_get_virtual_pipette_static_config( ) assert result == LoadedStaticPipetteData( - model="p20_single_v2.0", + model="p20_single_v2.2", display_name="P20 Single-Channel GEN2", min_volume=1, max_volume=20.0, @@ -69,7 +69,7 @@ def test_configure_virtual_pipette_for_volume( PipetteNameType.P50_SINGLE_FLEX.value, "my-pipette" ) assert result1 == LoadedStaticPipetteData( - model="p50_single_v3.0", + model="p50_single_v3.5", display_name="Flex 1-Channel 50 μL", min_volume=5, max_volume=50.0, @@ -77,9 +77,9 @@ def test_configure_virtual_pipette_for_volume( nozzle_offset_z=-259.15, home_position=230.15, flow_rates=FlowRates( - default_blow_out={"2.14": 4.0}, - default_aspirate={"2.14": 8.0}, - default_dispense={"2.14": 8.0}, + default_blow_out={"2.14": 57}, + default_aspirate={"2.14": 35}, + default_dispense={"2.14": 57}, ), tip_configuration_lookup_table=result1.tip_configuration_lookup_table, nominal_tip_overlap=result1.nominal_tip_overlap, @@ -94,7 +94,7 @@ def test_configure_virtual_pipette_for_volume( PipetteNameType.P50_SINGLE_FLEX.value, "my-pipette" ) assert result2 == LoadedStaticPipetteData( - model="p50_single_v3.0", + model="p50_single_v3.5", display_name="Flex 1-Channel 50 μL", min_volume=1, max_volume=30, @@ -102,9 +102,9 @@ def test_configure_virtual_pipette_for_volume( nozzle_offset_z=-259.15, home_position=230.15, flow_rates=FlowRates( - default_blow_out={"2.14": 4.0}, - default_aspirate={"2.14": 8.0}, - default_dispense={"2.14": 8.0}, + default_blow_out={"2.14": 26.7}, + default_aspirate={"2.14": 26.7}, + default_dispense={"2.14": 26.7}, ), tip_configuration_lookup_table=result2.tip_configuration_lookup_table, nominal_tip_overlap=result2.nominal_tip_overlap,