Remove django test environment setup code.

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

diff --git a/htsworkflow/submission/test/test_condorfastq.py b/htsworkflow/submission/test/test_condorfastq.py
index cffb5ac17175f59a3a4fc10219c5e151f578882b..1e1c2d9bc56677cdef09b5b2efca48d296e5fdb3 100644 (file)
--- a/htsworkflow/submission/test/test_condorfastq.py
+++ b/htsworkflow/submission/test/test_condorfastq.py
@@ -5,7 +5,12 @@ import os
 from pprint import pprint
 import shutil
 import tempfile
-import unittest
+
+from django.test import TestCase
+from django.test.utils import setup_test_environment, \
+     teardown_test_environment
+from django.db import connection
+from django.conf import settings
 
 from htsworkflow.submission.condorfastq import CondorFastqExtract
 from htsworkflow.submission.results import ResultMap
@@ -411,7 +416,7 @@ lib_turtle = """@prefix : <http://www.w3.org/1999/xhtml> .
 """
 HOST = "http://localhost"
 
-class TestCondorFastq(unittest.TestCase):
+class TestCondorFastq(TestCase):
     def setUp(self):
         self.cwd = os.getcwd()
 
@@ -676,9 +681,11 @@ class TestCondorFastq(unittest.TestCase):
 
 
 def suite():
-    suite = unittest.makeSuite(TestCondorFastq, 'test')
+    from unittest2 import TestSuite, defaultTestLoader
+    suite = TestSuite()
+    suite.addTests(defaultTestLoader.loadTestsFromTestCase(TestCondorFastq))
     return suite
 
 if __name__ == "__main__":
-    unittest.main(defaultTest='suite')
-
+    from unittest2 import main
+    main(defaultTest='suite')