Convert to unittest2

[htsworkflow.git] / htsworkflow / util / test / test_validate.py

diff --git a/htsworkflow/util/test/test_validate.py b/htsworkflow/util/test/test_validate.py
index 513a3a396221149e8fbadee0457638fdd7865be4..cc05f3c56641e645ccbabb8c5006f83c3b7168da 100644 (file)
--- a/htsworkflow/util/test/test_validate.py
+++ b/htsworkflow/util/test/test_validate.py
@@ -1,10 +1,10 @@
 import os
 from StringIO import StringIO
-import unittest
+from unittest2 import TestCase
 
 from htsworkflow.util import validate
 
-class TestValidate(unittest.TestCase):
+class TestValidate(TestCase):
     def test_phred33_works(self):
         q = StringIO(u"@ abc\nAGCT\n+\nBBBB\n")
         errors = validate.validate_fastq(q)
@@ -45,10 +45,14 @@ class TestValidate(unittest.TestCase):
         errors = validate.validate_fastq(q)
         self.failUnlessEqual(1, errors)
 
-def suite():
-    return unittest.makeSuite(testValidate, 'test')
 
-if __name__ == "__main__":
-    unittest.main(defaultTest='suite')
+def suite():
+    from unittest2 import TestSuite, defaultTestLoader
+    suite = TestSuite()
+    suite.addTests(defaultTestLoader.loadTestsFromTestCase(testValidate))
+    return suite
 
 
+if __name__ == "__main__":
+    from unittest2 import main
+    main(defaultTest="suite")