Change unittest2 back into unittest.

[htsworkflow.git] / encode_submission / test_encode_find.py

diff --git a/encode_submission/test_encode_find.py b/encode_submission/test_encode_find.py
index 05108955a4d31927b98d395b290ef986a3163d88..a81f27a35058c6a6bb39e5fe21909af0c21d6f85 100644 (file)
--- a/encode_submission/test_encode_find.py
+++ b/encode_submission/test_encode_find.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 from datetime import datetime
 import os
-import unittest
+from unittest import TestCase
 
 import RDF
 
@@ -12,9 +12,8 @@ from htsworkflow.util.rdfhelp import add_default_schemas, \
 from htsworkflow.util.rdfinfer import Infer
 
 SOURCE_PATH = os.path.split(os.path.abspath(__file__))[0]
-print SOURCE_PATH
 
-class TestEncodeFind(unittest.TestCase):
+class TestEncodeFind(TestCase):
     def setUp(self):
         self.model = get_model()
         add_default_schemas(self.model)
@@ -163,7 +162,12 @@ _:bnode120970
                              '12097')
 
 def suite():
-    return unittest.makeSuite(TestEncodeFind, "test")
+    from unittest import TestSuite, defaultTestLoader
+    suite = TestSuite()
+    suite.addTests(defaultTestLoader.loadTestsFromTestCase(TestEncodeFind))
+    return suite
+
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="suite")
+    from unittest import main
+    main()