Change unittest2 back into unittest.

[htsworkflow.git] / htsworkflow / submission / test / test_daf.py

diff --git a/htsworkflow/submission/test/test_daf.py b/htsworkflow/submission/test/test_daf.py
index 95dc1d9064688f4b63ca4c7b1a70866587deb9f7..5bc9014267cfbbb2c1536e8c21ac83d3d7f57d23 100644 (file)
--- a/htsworkflow/submission/test/test_daf.py
+++ b/htsworkflow/submission/test/test_daf.py
@@ -1,9 +1,10 @@
 from contextlib import contextmanager
+import logging
 import os
 from StringIO import StringIO
 import shutil
 import tempfile
-import unittest
+from unittest import TestCase, TestSuite, defaultTestLoader
 
 from htsworkflow.submission import daf, results
 from htsworkflow.util.rdfhelp import \
@@ -80,7 +81,7 @@ required         no
 """
 
 
-class TestDAF(unittest.TestCase):
+class TestDAF(TestCase):
     def test_parse(self):
 
         parsed = daf.fromstring(test_daf)
@@ -165,9 +166,9 @@ def dump_model(model):
     print turtle
 
 
-class TestUCSCSubmission(unittest.TestCase):
+class TestUCSCSubmission(TestCase):
     def setUp(self):
-        test_results.generate_sample_results_tree(self)
+        test_results.generate_sample_results_tree(self, 'daf_results')
 
     def tearDown(self):
         # see things created by temp_results.generate_sample_results_tree
@@ -247,7 +248,7 @@ thisView:FastqRd1 dafTerm:filename_re ".*\\\\.fastq" ;
         # server is 500 for this library
         self.failUnlessEqual(gel_cut, 100)
 
-        species = daf_mapper._get_library_attribute(libNode, 'species')
+        species = daf_mapper._get_library_attribute(libNode, 'species_name')
         self.failUnlessEqual(species, "Homo sapiens")
 
         with mktempdir('analysis') as analysis_dir:
@@ -329,11 +330,13 @@ def mktempfile(suffix='', prefix='tmp', dir=None):
     os.close(fd)
     os.unlink(pathname)
 
-
 def suite():
-    suite = unittest.makeSuite(TestDAF, 'test')
-    suite.addTest(unittest.makeSuite(TestUCSCSubmission, 'test'))
+    suite = TestSuite()
+    suite.addTests(defaultTestLoader.loadTestsFromTestCase(TestDAF))
+    suite.addTests(defaultTestLoader.loadTestsFromTestCase(TestUCSCSubmission))
     return suite
 
 if __name__ == "__main__":
-    unittest.main(defaultTest='suite')
+    logging.basicConfig(level=logging.DEBUG)
+    from unittest import main
+    main(defaultTest='suite')