post-edge-merge test fixes

Author: sanni-t

api/tests/opentrons/protocol_api_integration/test_transfer_with_liquid_classes.py

@@ -1678,7 +1678,7 @@ def test_water_distribution_raises_error_for_disposal_vol_without_blowout(
 )
 @pytest.mark.parametrize(
     ["new_tip", "expected_number_of_calls"],
-    [("once", 1), ("always", 12), ("per_source", 12)],
+    [("always", 12), ("per source", 12)],
 )
 def test_water_transfer_with_lpd(
     simulated_protocol_context: ProtocolContext,
@@ -1869,4 +1869,12 @@ def test_incompatible_transfers_skip_probing_even_with_lpd_on(
             new_tip="always",
             trash_location=trash,
         )
+        pipette_1k.transfer_liquid(
+            liquid_class=water,
+            volume=40,
+            source=nest_plate.rows()[0],
+            dest=arma_plate.rows()[0],
+            new_tip="once",
+            trash_location=trash,
+        )
         patched_liquid_probe.assert_not_called()

api/tests/opentrons/protocols/advanced_control/transfers/test_transfer_liquid_utils.py

@@ -43,8 +43,8 @@
             ),
             pytest.raises(
                 RuntimeError,
-                match="Received submerge start location of Location\\(point=Point\\(x=4, y=5, z=6\\), labware=, is_meniscus=False\\)"
-                " and aspirate location of Location\\(point=Point\\(x=5, y=6, z=7\\), labware=, is_meniscus=False\\)."
+                match="Received submerge start location of Location\\(point=Point\\(x=4, y=5, z=6\\), labware=, meniscus_tracking=None\\)"
+                " and aspirate location of Location\\(point=Point\\(x=5, y=6, z=7\\), labware=, meniscus_tracking=None\\)."
                 " Submerge start location z should not be lower than the aspirate location z.",
             ),
         ),
@@ -57,8 +57,8 @@
             ),
             pytest.raises(
                 RuntimeError,
-                match="Received retract end location of Location\\(point=Point\\(x=4, y=5, z=6\\), labware=, is_meniscus=False\\)"
-                " and dispense location of Location\\(point=Point\\(x=5, y=6, z=7\\), labware=, is_meniscus=False\\)."
+                match="Received retract end location of Location\\(point=Point\\(x=4, y=5, z=6\\), labware=, meniscus_tracking=None\\)"
+                " and dispense location of Location\\(point=Point\\(x=5, y=6, z=7\\), labware=, meniscus_tracking=None\\)."
                 " Retract end location z should not be lower than the dispense location z.",
             ),
         ),
@@ -102,7 +102,7 @@ def test_raise_only_if_pip_location_below_target(
             pytest.raises(
                 RuntimeError,
                 match="Retract end location Location\\(point=Point\\(x=4, y=5, z=6\\), labware=,"
-                " is_meniscus=False\\) is inside the liquid in well Well A1 of"
+                " meniscus_tracking=None\\) is inside the liquid in well Well A1 of"
                 " test_labware when it should be outside\\(above\\) the liquid.",
             ),
         ),
@@ -113,7 +113,7 @@ def test_raise_only_if_pip_location_below_target(
             pytest.raises(
                 RuntimeError,
                 match="Retract end location Location\\(point=Point\\(x=5, y=6, z=7\\), labware=,"
-                " is_meniscus=False\\) is inside the liquid in well Well A1 of"
+                " meniscus_tracking=None\\) is inside the liquid in well Well A1 of"
                 " test_labware when it should be outside\\(above\\) the liquid.",
             ),
         ),