fix vt remove_liquid

PyLabRobot · Nov 2, 2023 · e0c735a · e0c735a
1 parent fd3e777
commit e0c735a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/pylabrobot/resources/volume_tracker.py b/pylabrobot/resources/volume_tracker.py
@@ -67,8 +67,8 @@ def remove_liquid(self, volume: float) -> None:
 
     removed_volume = 0.0
     while removed_volume < volume:
-      liquid, volume = self.liquids.pop()
-      removed_volume += volume
+      liquid, liquid_volume = self.liquids.pop()
+      removed_volume += liquid_volume
 
       # If we have more liquid than we need, put the excess back.
       if removed_volume > volume:

diff --git a/pylabrobot/resources/volume_tracker_tests.py b/pylabrobot/resources/volume_tracker_tests.py
@@ -33,8 +33,11 @@ def test_add_liquid(self):
   def test_remove_liquid(self):
     tracker = VolumeTracker(max_volume=100)
     tracker.add_liquid(liquid=None, volume=60)
+    tracker.commit()
+
     self.assertEqual(tracker.get_used_volume(), 60)
-    self.assertEqual(tracker.get_free_volume(), 40)
+    tracker.remove_liquid(volume=20)
+    self.assertEqual(tracker.get_used_volume(), 40)
 
     with self.assertRaises(TooLittleLiquidError):
       tracker.remove_liquid(volume=100)