Change unittest2 back into unittest.

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

diff --git a/htsworkflow/pipelines/test/test_runfolder030.py b/htsworkflow/pipelines/test/test_runfolder030.py
index 2a060d13810d3a41bdcb53dc80b9a7b93a88a3ac..323d7da2008abd8290054c2e74d0460c02cb00a7 100644 (file)
--- a/htsworkflow/pipelines/test/test_runfolder030.py
+++ b/htsworkflow/pipelines/test/test_runfolder030.py
@@ -4,13 +4,13 @@ from datetime import datetime, date
 import os
 import tempfile
 import shutil
 import os
 import tempfile
 import shutil

-import unittest
+from unittest import TestCase

 
 from htsworkflow.pipelines import firecrest
 from htsworkflow.pipelines import bustard
 from htsworkflow.pipelines import gerald
 from htsworkflow.pipelines import runfolder
 
 from htsworkflow.pipelines import firecrest
 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 *
 
 
 from htsworkflow.pipelines.test.simulate_runfolder import *
 


@@ -678,7 +678,7 @@ def make_runfolder(obj=None):
         obj.gerald_dir = gerald_dir
 
 
         obj.gerald_dir = gerald_dir
 
 

-class RunfolderTests(unittest.TestCase):
+class RunfolderTests(TestCase):

     """
     Test components of the runfolder processing code
     which includes firecrest, bustard, and gerald
     """
     Test components of the runfolder processing code
     which includes firecrest, bustard, and gerald


@@ -875,28 +875,31 @@ class RunfolderTests(unittest.TestCase):
 
         # do we get the flowcell id from the filename?
         self.failUnlessEqual(len(runs), 1)
 
         # do we get the flowcell id from the filename?
         self.failUnlessEqual(len(runs), 1)

-        self.failUnlessEqual(runs[0].name, 'run_207BTAAXX_2008-04-19.xml')
+        self.failUnlessEqual(runs[0].serialization_filename, 'run_207BTAAXX_2008-04-19.xml')

 
         # do we get the flowcell id from the FlowcellId.xml file
         make_flowcell_id(self.runfolder_dir, '207BTAAXY')
         runs = runfolder.get_runs(self.runfolder_dir)
         self.failUnlessEqual(len(runs), 1)
 
         # do we get the flowcell id from the FlowcellId.xml file
         make_flowcell_id(self.runfolder_dir, '207BTAAXY')
         runs = runfolder.get_runs(self.runfolder_dir)
         self.failUnlessEqual(len(runs), 1)

-        self.failUnlessEqual(runs[0].name, 'run_207BTAAXY_2008-04-19.xml')
+        self.failUnlessEqual(runs[0].serialization_filename, 'run_207BTAAXY_2008-04-19.xml')

 
         r1 = runs[0]
         xml = r1.get_elements()
         xml_str = ElementTree.tostring(xml)
 
         r2 = runfolder.PipelineRun(xml=xml)
 
         r1 = runs[0]
         xml = r1.get_elements()
         xml_str = ElementTree.tostring(xml)
 
         r2 = runfolder.PipelineRun(xml=xml)

-        self.failUnlessEqual(r1.name, r2.name)
+        self.failUnlessEqual(r1.serialization_filename, r2.serialization_filename)

         self.failIfEqual(r2.image_analysis, None)
         self.failIfEqual(r2.bustard, None)
         self.failIfEqual(r2.gerald, None)
 
 
 def suite():
         self.failIfEqual(r2.image_analysis, None)
         self.failIfEqual(r2.bustard, None)
         self.failIfEqual(r2.gerald, None)
 
 
 def suite():

-    return unittest.makeSuite(RunfolderTests,'test')
+    from unittest import TestSuite, defaultTestLoader
+    suite = TestSuite()
+    suite.addTests(defaultTestLoader.loadTestsFromTestCase(RunfolderTests))
+    return suite

 
 if __name__ == "__main__":
 
 if __name__ == "__main__":

-    unittest.main(defaultTest="suite")
-
+    from unittest import main
+    main(defaultTest="suite")