X-Git-Url: http://woldlab.caltech.edu/gitweb/?a=blobdiff_plain;f=htsworkflow%2Fsubmission%2Ftest%2Ftest_condorfastq.py;h=ffb9f88620356ba0e61800db60fa4715463515e2;hb=6ea8652c57937ff48c18fc3990ae7f2ee0875ab9;hp=cffb5ac17175f59a3a4fc10219c5e151f578882b;hpb=3c1c31b97282ad83b38964f263398185aceb6472;p=htsworkflow.git diff --git a/htsworkflow/submission/test/test_condorfastq.py b/htsworkflow/submission/test/test_condorfastq.py index cffb5ac..ffb9f88 100644 --- a/htsworkflow/submission/test/test_condorfastq.py +++ b/htsworkflow/submission/test/test_condorfastq.py @@ -5,7 +5,8 @@ import os from pprint import pprint import shutil import tempfile -import unittest + +from django.test import TestCase from htsworkflow.submission.condorfastq import CondorFastqExtract from htsworkflow.submission.results import ResultMap @@ -411,7 +412,7 @@ lib_turtle = """@prefix : . """ HOST = "http://localhost" -class TestCondorFastq(unittest.TestCase): +class TestCondorFastq(TestCase): def setUp(self): self.cwd = os.getcwd() @@ -676,9 +677,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')