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 7959d1e13d9a323281885d63454790f34f85c48f..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
-from unittest2 import TestCase, TestSuite, defaultTestLoader
+from unittest import TestCase, TestSuite, defaultTestLoader
 
 from htsworkflow.submission import daf, results
 from htsworkflow.util.rdfhelp import \
@@ -167,7 +168,7 @@ def dump_model(model):
 
 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
@@ -331,9 +332,11 @@ def mktempfile(suffix='', prefix='tmp', dir=None):
 
 def suite():
     suite = TestSuite()
-    suite.addTests(defaultTestLoader.loadTestsFromTestCase(TestUCSCInfo))
+    suite.addTests(defaultTestLoader.loadTestsFromTestCase(TestDAF))
+    suite.addTests(defaultTestLoader.loadTestsFromTestCase(TestUCSCSubmission))
     return suite
 
 if __name__ == "__main__":
-    from unittest2 import main
+    logging.basicConfig(level=logging.DEBUG)
+    from unittest import main
     main(defaultTest='suite')