X-Git-Url: http://woldlab.caltech.edu/gitweb/?a=blobdiff_plain;f=htsworkflow%2Fsubmission%2Ftest%2Ftest_ucsc.py;h=fad690e27f5ee638d315c593336dbd110a84fa96;hb=6ea8652c57937ff48c18fc3990ae7f2ee0875ab9;hp=53ac287a5f0b876eb18df0638277493e7e106604;hpb=3c1c31b97282ad83b38964f263398185aceb6472;p=htsworkflow.git diff --git a/htsworkflow/submission/test/test_ucsc.py b/htsworkflow/submission/test/test_ucsc.py index 53ac287..fad690e 100644 --- a/htsworkflow/submission/test/test_ucsc.py +++ b/htsworkflow/submission/test/test_ucsc.py @@ -1,4 +1,4 @@ -import unittest +from unittest2 import TestCase, TestSuite, defaultTestLoader from StringIO import StringIO from htsworkflow.submission import ucsc @@ -9,7 +9,7 @@ wgEncodeCaltechRnaSeqGm12878R2x75Il200FastqRd2Rep1.fastq.tgz project=wgEncode; g """ -class TestUCSCInfo(unittest.TestCase): +class TestUCSCInfo(TestCase): def test_parse_encodedcc_file(self): stream = StringIO(ENCODE_FILES) file_index = ucsc.parse_ucsc_file_index(stream, 'http://example.com/files') @@ -21,9 +21,10 @@ class TestUCSCInfo(unittest.TestCase): self.assertEquals(attributes['project'], 'wgEncode') def suite(): - suite = unittest.makeSuite(TestUCSCInfo, 'test') + suite = TestSuite() + suite.addTests(defaultTestLoader.loadTestsFromTestCase(TestUCSCInfo)) return suite if __name__ == "__main__": - unittest.main(defaultTest='suite') - + from unittest2 import main + main(defaultTest='suite')