A few python 2.6 test case incompatibilities.

diff --git a/htsworkflow/pipelines/test/test_runfolder_rta1_12.py b/htsworkflow/pipelines/test/test_runfolder_rta1_12.py
index 9b7bec8ab8169d2a9c39b01f64ae63753158ae99..28863c1c3be98ba6e71c72e2d0fcc25a89f5db87 100644 (file)
--- a/htsworkflow/pipelines/test/test_runfolder_rta1_12.py
+++ b/htsworkflow/pipelines/test/test_runfolder_rta1_12.py
@@ -211,7 +211,7 @@ class RunfolderTests(unittest.TestCase):
                 self.assertEqual(lane.match_codes['R2'], 6)
                 self.assertEqual(lane.match_codes['NM'], 4)
 
-            self.assertIn(lane.sample_name, samples)
+            self.assertTrue(lane.sample_name in samples)
             #self.assertEqual(lane.lane_id, 1)
             self.assertEqual(len(lane.mapped_reads), 1)
             self.assertEqual(lane.match_codes['U1'], 0)

diff --git a/htsworkflow/pipelines/test/test_samplekey.py b/htsworkflow/pipelines/test/test_samplekey.py
index 703a03721cc43b84143147d9ae6b721b9423cea9..a4287d34b113825e5b6621ac8c8fedfd78dc66e3 100644 (file)
--- a/htsworkflow/pipelines/test/test_samplekey.py
+++ b/htsworkflow/pipelines/test/test_samplekey.py
@@ -16,10 +16,10 @@ class TestSampleKey(unittest.TestCase):
         self.assertEqual(hash(k1), hash(k2))
         self.assertNotEqual(k1, k3)
 
-        self.assertLess(k1, k3)
-        self.assertLessEqual(k1, k2)
+        self.assertTrue(k1 < k3)
+        self.assertTrue(k1 <= k2)
 
-        self.assertGreater(k3, k1)
+        self.assertTrue(k3 > k1)
 
 
     def test_matching(self):