Backed out some WIP to allow for clean PR

biocore · May 8, 2019 · 34e5393 · 34e5393
1 parent 6ba7683
commit 34e5393
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/labcontrol/db/process.py b/labcontrol/db/process.py
@@ -2569,7 +2569,7 @@ def generate_echo_picklist(self, max_vol_per_well=30000):
         for comp, vol in self.components:
             well = comp.container
             vol_sample[well.row - 1][well.column - 1] = vol
-        return PoolingProcess._format_picklist(vol_sample, max_vol_per_well)
+        return PoolingProcess._format_picklist(vol_sample)
 
     def generate_epmotion_file(self):
         """Generates an EpMotion file to perform the pooling

diff --git a/labcontrol/db/tests/test_process.py b/labcontrol/db/tests/test_process.py
@@ -1400,13 +1400,6 @@ def test_generate_echo_picklist_default(self):
         obs = PoolingProcess(3).generate_echo_picklist()
         self.assertEqual(obs, POOLING_PROCESS_ECHO_PICKLIST)
 
-    def test_generate_echo_picklist_nondefault_volume(self):
-        # Setting the max_vol_per_well value to something very low (below about
-        # 400 nL) causes the pooling process to place some of the components
-        # into additional wells
-        obs = PoolingProcess(3).generate_echo_picklist(1)
-        self.assertEqual(obs, POOLING_PROCESS_ECHO_PICKLIST)
-
     def test_generate_epmotion_file(self):
         obs = PoolingProcess(1).generate_epmotion_file()
         obs_lines = obs.splitlines()