Change unittest2 back into unittest.

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

diff --git a/htsworkflow/pipelines/test/test_genomemap.py b/htsworkflow/pipelines/test/test_genomemap.py
index d0c1e660e5a786c50794d278f164678026a5cb74..7640910afd0ae6078a658237049ac89d75f62957 100644 (file)
--- a/htsworkflow/pipelines/test/test_genomemap.py
+++ b/htsworkflow/pipelines/test/test_genomemap.py
@@ -5,9 +5,9 @@ import os
 from StringIO import StringIO
 import shutil
 import tempfile
-import unittest
+from unittest import TestCase
 
-from htsworkflow.pipelines.runfolder import ElementTree
+from htsworkflow.pipelines import ElementTree
 from htsworkflow.pipelines import genomemap
 
 MINI_GENOME_XML = '''<sequenceSizes>
@@ -15,7 +15,7 @@ MINI_GENOME_XML = '''<sequenceSizes>
         <chromosome fileName="chr1.fa" contigName="chr1" totalBases="197195432"/>
 </sequenceSizes>
 '''
-class TestGenomeMap(unittest.TestCase):
+class TestGenomeMap(TestCase):
     def test_genomesizes_xml(self):
         xml = ElementTree.fromstring(MINI_GENOME_XML)
         g = genomemap.GenomeMap()
@@ -76,5 +76,13 @@ class TestGenomeMap(unittest.TestCase):
         self.assertEqual(g['chr1.fa'], '{0}/chr1.fa'.format(tempgenome))
 
 
+def suite():
+    from unittest import TestSuite, defaultTestLoader
+    suite = TestSuite()
+    suite.addTests(defaultTestLoader.loadTestsFromTestCase(TestGenomeMap))
+    return suite
+
+
 if __name__ == "__main__":
-    unittest.main()
+    from unittest import main
+    main(defaultTest="suite")