Convert to unittest2

[htsworkflow.git] / htsworkflow / pipelines / test / test_samplekey.py

diff --git a/htsworkflow/pipelines/test/test_samplekey.py b/htsworkflow/pipelines/test/test_samplekey.py
index a4287d34b113825e5b6621ac8c8fedfd78dc66e3..ecd273dedd1c3eab53fc0c6b94b720ecadb5145f 100644 (file)
--- a/htsworkflow/pipelines/test/test_samplekey.py
+++ b/htsworkflow/pipelines/test/test_samplekey.py
@@ -2,11 +2,11 @@
 """More direct synthetic test cases for the eland output file processing
 """
 from StringIO import StringIO
 """More direct synthetic test cases for the eland output file processing
 """
 from StringIO import StringIO

-import unittest
+from unittest2 import TestCase

 
 from htsworkflow.pipelines.samplekey import SampleKey
 
 
 from htsworkflow.pipelines.samplekey import SampleKey
 

-class TestSampleKey(unittest.TestCase):
+class TestSampleKey(TestCase):

     def test_equality(self):
         k1 = SampleKey(lane=1, read='1', sample='12345')
         k2 = SampleKey(lane=1, read=1, sample='12345')
     def test_equality(self):
         k1 = SampleKey(lane=1, read='1', sample='12345')
         k2 = SampleKey(lane=1, read=1, sample='12345')


@@ -43,5 +43,13 @@ class TestSampleKey(unittest.TestCase):
         self.assertTrue(k2.matches(q3))
         self.assertTrue(k3.matches(q3))
 
         self.assertTrue(k2.matches(q3))
         self.assertTrue(k3.matches(q3))
 

+def suite():
+    from unittest2 import TestSuite, defaultTestLoader
+    suite = TestSuite()
+    suite.addTests(defaultTestLoader.loadTestsFromTestCase(TestSampleKey))
+    return suite
+
+

 if __name__ == "__main__":
 if __name__ == "__main__":

-    unittest.main()
+    from unittest2 import main
+    main(defaultTest="suite")