Change unittest2 back into unittest.

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

diff --git a/htsworkflow/pipelines/test/test_run_xml.py b/htsworkflow/pipelines/test/test_run_xml.py
index 85926459f11b7eb7a4cffd463895ea809fbb1164..42dedf9be9ed160fc2c6308ce88e3036e98fd1f6 100644 (file)
--- a/htsworkflow/pipelines/test/test_run_xml.py
+++ b/htsworkflow/pipelines/test/test_run_xml.py
@@ -1,13 +1,14 @@
 import os
-import unittest
+from unittest import TestCase
 from StringIO import StringIO
 
 from simulate_runfolder import TESTDATA_DIR
 from htsworkflow.pipelines.runfolder import load_pipeline_run_xml
 
 from htsworkflow.pipelines.eland import SampleKey
-class testLoadRunXML(unittest.TestCase):
 
+
+class testLoadRunXML(TestCase):
     def _check_run_xml(self, run_xml_name, results, eland_results=8):
         run_xml_path = os.path.join(TESTDATA_DIR, run_xml_name)
         run = load_pipeline_run_xml(run_xml_path)
@@ -94,8 +95,14 @@ class testLoadRunXML(unittest.TestCase):
                    }
         self._check_run_xml(run_xml_name, results, eland_results=8)
 
+
 def suite():
-    return unittest.makeSuite(testLoadRunXML,'test')
+    from unittest import TestSuite, defaultTestLoader
+    suite = TestSuite()
+    suite.addTests(defaultTestLoader.loadTestsFromTestCase(testLoadRunXML))
+    return suite
+
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="suite")
+    from unittest import main
+    main(defaultTest="suite")