From: Diane Trout <diane@caltech.edu>
Date: Fri, 6 Jul 2012 23:12:25 +0000 (-0700)
Subject: A few python 2.6 test case incompatibilities.
X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=htsworkflow.git;a=commitdiff_plain;h=0ce512e26f0a39c9b86eefa9261ba6816d4acbc9

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 9b7bec8..28863c1 100644
--- 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 703a037..a4287d3 100644
--- 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):