Change unittest2 back into unittest.

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

diff --git a/htsworkflow/submission/test/test_submission.py b/htsworkflow/submission/test/test_submission.py
index 90852ceb766f56a871fc199d675982fc095b98c2..0c4e0870399eb30dbc1702d5fa1912de2a3ab837 100644 (file)
--- a/htsworkflow/submission/test/test_submission.py
+++ b/htsworkflow/submission/test/test_submission.py
@@ -1,8 +1,9 @@
+
 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 \
@@ -24,24 +25,6 @@ import RDF
 #import logging
 #logging.basicConfig(level=logging.DEBUG)
 
-def generate_sample_results_tree(obj):
-    obj.tempdir = tempfile.mkdtemp(prefix="submission_test")
-    obj.sourcedir = os.path.join(obj.tempdir, 'source')
-    obj.resultdir = os.path.join(obj.tempdir, 'results')
-
-    for d in [os.path.join(obj.tempdir, S1_NAME),
-              os.path.join(obj.tempdir, S2_NAME),
-              ]:
-        os.mkdir(os.path.join(obj.tempdir, d))
-
-    tomake = []
-    tomake.extend(S1_FILES)
-    tomake.extend(S2_FILES)
-    for f in tomake:
-        stream = open(os.path.join(obj.tempdir, f), 'w')
-        stream.write(f)
-        stream.close()
-
 class TestSubmissionModule(TestCase):
     def test_empty_list_submission(self):
         model = get_model()
@@ -84,7 +67,7 @@ class TestSubmissionModule(TestCase):
 
 class TestSubmission(TestCase):
     def setUp(self):
-        generate_sample_results_tree(self)
+        generate_sample_results_tree(self, 'submission_test')
         self.model = get_model()
 
     def tearDown(self):
@@ -122,10 +105,8 @@ thisView:alignments ucscDaf:filename_re ".*\\.bam$" ;
 
         """
         map = ResultMap()
-        print self.tempdir
-        print os.listdir(self.tempdir)
-        map['1000'] = os.path.join(self.tempdir, S1_NAME)
-        map['2000'] = os.path.join(self.tempdir, S2_NAME)
+        map['1000'] = os.path.join(self.sourcedir, S1_NAME)
+        map['2000'] = os.path.join(self.sourcedir, S2_NAME)
 
         s = Submission('foo', self.model, 'http://localhost')
         mock = MockAddDetails(self.model, turtle)
@@ -189,5 +170,5 @@ def suite():
     return suite
 
 if __name__ == "__main__":
-    from unittest2 import main
+    from unittest import main
     main(defaultTest='suite')