Change unittest2 back into unittest.

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

diff --git a/htsworkflow/pipelines/test/test_summary.py b/htsworkflow/pipelines/test/test_summary.py
index ab9f96239a63ccd69ce633cd11d36b28e0fe7e4e..fbc025bd2aa79c8759bff1fcaaa93631856bdbf4 100644 (file)
--- a/htsworkflow/pipelines/test/test_summary.py
+++ b/htsworkflow/pipelines/test/test_summary.py
@@ -1,12 +1,12 @@
 #!/usr/bin/env python
 import os
 from StringIO import StringIO
-import unittest
+from unittest import TestCase
 
 from htsworkflow.pipelines import summary
 from simulate_runfolder import TESTDATA_DIR
 
-class SummaryTests(unittest.TestCase):
+class SummaryTests(TestCase):
     """Test elements of the summary file parser
     """
     def test_is_xml(self):
@@ -20,22 +20,28 @@ class SummaryTests(unittest.TestCase):
 
     def test_xml_summary_file(self):
         pathname = os.path.join(TESTDATA_DIR, 'Summary-casava1.7.xml')
-        s = summary.Summary(pathname)
+        s = summary.SummaryGA(pathname)
         self.failUnlessEqual(len(s.lane_results[0]), 8)
         self.failUnlessEqual(s.lane_results[0][1].cluster, (1073893, 146344))
 
     def test_html_summary_file(self):
         pathname = os.path.join(TESTDATA_DIR, 'Summary-ipar130.htm')
-        s = summary.Summary(pathname)
+        s = summary.SummaryGA(pathname)
         self.failUnlessEqual(len(s.lane_results[0]), 8)
         self.failUnlessEqual(s.lane_results[0][1].cluster, (126910, 4300))
 
     def test_hiseq_sample_summary_file(self):
         pathname = os.path.join(TESTDATA_DIR, 'sample_summary_1_12.htm')
-        s = summary.Summary(pathname)
+        s = summary.SummaryGA(pathname)
+
 
 def suite():
-    return unittest.makeSuite(SummaryTests,'test')
+    from unittest import TestSuite, defaultTestLoader
+    suite = TestSuite()
+    suite.addTests(defaultTestLoader.loadTestsFromTestCase(SummaryTests))
+    return suite
+
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="suite")
+    from unittest import main
+    main(defaultTest="suite")