Skip to content

Commit 3aee6ee

Browse files
committed
fix tests for #6f02bb
1 parent 5c35777 commit 3aee6ee

File tree

3 files changed

+18
-10
lines changed

3 files changed

+18
-10
lines changed

pylabrobot/liquid_handling/backends/serializing_backend_tests.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,11 +208,11 @@ async def test_dispense96(self):
208208
"dispense": {
209209
"well_names": [well.name for well in self.plate.get_all_items()],
210210
"offset": serialize(Coordinate.zero()),
211-
"volume": 10,
211+
"volume": 10.0,
212212
"flow_rate": None,
213213
"liquid_height": None,
214214
"blow_out_air_volume": None,
215-
"liquids": [[[None, 10]]] * 96, # tuple, list of liquids per well, list of wells
215+
"liquids": [[[None, 10.0]]] * 96, # tuple, list of liquids per well, list of wells
216216
"tips": [serialize(tip) for tip in tips],
217217
}
218218
},

pylabrobot/liquid_handling/liquid_handler.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1542,7 +1542,7 @@ async def drop_tips96(
15421542
if not self.head96[i].has_tip:
15431543
continue
15441544
tip = self.head96[i].get_tip()
1545-
if tip.tracker.get_used_volume() > 0 and not allow_nonzero_volume:
1545+
if tip.tracker.get_used_volume() > 0 and not allow_nonzero_volume and does_volume_tracking():
15461546
error = f"Cannot drop tip with volume {tip.tracker.get_used_volume()} on channel {i}"
15471547
raise RuntimeError(error)
15481548
if isinstance(resource, TipRack):
@@ -1942,7 +1942,6 @@ async def dispense96(
19421942
liquids: List[Tuple[Optional[Liquid], float]]
19431943
if tip.tracker.is_disabled or not does_volume_tracking():
19441944
liquids = [(None, volume)]
1945-
all_liquids.append(liquids)
19461945
else:
19471946
liquids = tip.tracker.remove_liquid(volume=volume)
19481947
reversed_liquids = list(reversed(liquids))

pylabrobot/liquid_handling/liquid_handler_tests.py

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import itertools
22
import tempfile
33
import unittest
4+
import unittest.mock
45
from typing import Any, Dict, List, Optional, Union, cast
56

67
import pytest
@@ -647,15 +648,23 @@ async def test_return_tips96(self):
647648
await self.lh.return_tips()
648649

649650
async def test_aspirate_dispense96(self):
650-
self.plate.get_item("A1").tracker.set_liquids([(None, 10)])
651651
await self.lh.pick_up_tips96(self.tip_rack)
652652
await self.lh.aspirate96(self.plate, volume=10)
653-
for i in range(96):
654-
self.assertTrue(self.lh.head96[i].has_tip)
655-
self.assertEqual(self.lh.head96[i].get_tip().tracker.get_used_volume(), 10)
653+
self.lh.backend.dispense96 = unittest.mock.AsyncMock()
656654
await self.lh.dispense96(self.plate, volume=10)
657-
for i in range(96):
658-
self.assertEqual(self.lh.head96[i].get_tip().tracker.get_used_volume(), 0)
655+
self.lh.backend.dispense96.assert_called_with(
656+
dispense=MultiHeadDispensePlate(
657+
wells=self.plate.get_all_items(),
658+
offset=Coordinate.zero(),
659+
tips=[self.lh.head96[i].get_tip() for i in range(96)],
660+
volume=10,
661+
flow_rate=None,
662+
liquid_height=None,
663+
blow_out_air_volume=None,
664+
liquids=[[(None, 10)] for _ in range(96)],
665+
mix=None,
666+
)
667+
)
659668

660669
async def test_transfer(self):
661670
t = self.tip_rack.get_item("A1").get_tip()

0 commit comments

Comments
 (0)