X-Git-Url: http://woldlab.caltech.edu/gitweb/?a=blobdiff_plain;f=htsworkflow%2Fsubmission%2Ftest%2Ftest_condorfastq.py;h=2d232715e5289d93c17b68da92c7dfdac45f6b04;hb=d078bd2653d1d702d54a0ff12f91ef2bd85d8d0e;hp=cffb5ac17175f59a3a4fc10219c5e151f578882b;hpb=8bbe0264745aeab86f0749127c9a9d69bb72f4f2;p=htsworkflow.git diff --git a/htsworkflow/submission/test/test_condorfastq.py b/htsworkflow/submission/test/test_condorfastq.py index cffb5ac..2d23271 100644 --- 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 : . """ 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 unittest import TestSuite, defaultTestLoader + suite = TestSuite() + suite.addTests(defaultTestLoader.loadTestsFromTestCase(TestCondorFastq)) return suite if __name__ == "__main__": - unittest.main(defaultTest='suite') - + from unittest import main + main(defaultTest='suite')