Change unittest2 back into unittest.

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

diff --git a/htsworkflow/submission/test/test_ucsc.py b/htsworkflow/submission/test/test_ucsc.py
index a003594310069b5108073890abe1d99ec409f2bf..b4cb2d8bef2a24be839c2d631392c2311e6cac98 100644 (file)
--- a/htsworkflow/submission/test/test_ucsc.py
+++ b/htsworkflow/submission/test/test_ucsc.py
@@ -1,4 +1,4 @@
-import unittest
+from unittest import TestCase, TestSuite, defaultTestLoader
 from StringIO import StringIO
 
 from htsworkflow.submission import ucsc
@@ -9,10 +9,10 @@ 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)
+        file_index = ucsc.parse_ucsc_file_index(stream, 'http://example.com/files')
         self.assertEquals(len(file_index), 2)
 
         for attributes in file_index.values():
@@ -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 unittest import main
+    main(defaultTest='suite')