Change unittest2 back into unittest.

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

diff --git a/htsworkflow/pipelines/test/test_extract_results.py b/htsworkflow/pipelines/test/test_extract_results.py
index b64bd0f7f9a8cc4bfcf0a3715efeff05029bf300..29ab3fddd71d7f7af123fc882adec7657f8d8e54 100644 (file)
--- a/htsworkflow/pipelines/test/test_extract_results.py
+++ b/htsworkflow/pipelines/test/test_extract_results.py
@@ -6,14 +6,14 @@ import os
 import tempfile
 import shutil
 import sys
-import unittest
+from unittest import TestCase
 
 from htsworkflow.pipelines import eland
 from htsworkflow.pipelines import ipar
 from htsworkflow.pipelines import bustard
 from htsworkflow.pipelines import gerald
 from htsworkflow.pipelines import runfolder
-from htsworkflow.pipelines.runfolder import ElementTree
+from htsworkflow.pipelines import ElementTree
 
 from htsworkflow.pipelines.test.simulate_runfolder import *
 
@@ -60,7 +60,7 @@ def make_runfolder(obj=None):
         obj.gerald_dir = gerald_dir
 
 
-class RunfolderExtractTests(unittest.TestCase):
+class RunfolderExtractTests(TestCase):
     """
     Test the extract result code.
     """
@@ -79,10 +79,15 @@ class RunfolderExtractTests(unittest.TestCase):
         self.failUnlessEqual(len(archive), 34)
         self.failUnless('asite_090608_HWI-EAS229_0117_4286GAAXX_l6_r1.tar.bz2' in archive)
 
-        
+
 def suite():
-    return unittest.makeSuite(RunfolderExtractTests,'test')
+    from unittest import TestSuite, defaultTestLoader
+    suite = TestSuite()
+    suite.addTests(defaultTestLoader.loadTestsFromTestCase(RunfolderExtractTests))
+    return suite
+
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="suite")
+    from unittest import main
+    main(defaultTest="suite")