sets Pipette.previous_placeable to None every time instrument mover i…

…s homed or retracted
Opentrons · Feb 14, 2018 · ff57a2d · ff57a2d
1 parent ec1f148
commit ff57a2d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/api/opentrons/instruments/pipette.py b/api/opentrons/instruments/pipette.py
@@ -915,6 +915,7 @@ def _pick_up_tip(
  self._add_tip(
  length=self.robot.config.tip_length[self.mount][self.type]
  )
+ self.previous_placeable = None # no longer inside a placeable
  self.robot.poses = self.instrument_mover.fast_home(
  self.robot.poses, abs(plunge_depth))
 
@@ -1047,6 +1048,7 @@ def _home(mount):
  self.robot.poses = self.instrument_actuator.home(
  self.robot.poses)
  self.robot.poses = self.instrument_mover.home(self.robot.poses)
+ self.previous_placeable = None # no longer inside a placeable
 
  _home(self.mount)
  return self

diff --git a/api/tests/opentrons/labware/test_pipette.py b/api/tests/opentrons/labware/test_pipette.py
@@ -1485,6 +1485,8 @@ def test_mix_with_named_args(self):
  self.p200.dispense = mock.Mock()
  self.p200.mix(volume=50, repetitions=2)
 
+ print(self.p200.tip_racks)
+
  self.assertEqual(
  self.p200.dispense.mock_calls,
  [
@@ -1496,7 +1498,7 @@ def test_mix_with_named_args(self):
  self.p200.aspirate.mock_calls,
  [
  mock.call.aspirate(volume=50,
- location=self.p200.tip_racks[0][0],
+ location=None,
  rate=1.0),
  mock.call.aspirate(50, rate=1.0)
  ]