Change unittest2 back into unittest.

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

diff --git a/htsworkflow/submission/test/test_encoded.py b/htsworkflow/submission/test/test_encoded.py
index 675d944a4bc0bb33e1e1b78be7ba4608da64d511..a1b22a02feca20e6552c2fc7c40068868134b02d 100644 (file)
--- a/htsworkflow/submission/test/test_encoded.py
+++ b/htsworkflow/submission/test/test_encoded.py
@@ -1,7 +1,7 @@
 import json
 import os
 from pprint import pprint
-from unittest2 import TestCase, TestSuite, defaultTestLoader, skip
+from unittest import TestCase, TestSuite, defaultTestLoader, skip
 
 from htsworkflow.submission.encoded import (ENCODED,
      ENCODED_CONTEXT,
@@ -13,11 +13,11 @@ class TestEncoded(TestCase):
         encode = ENCODED('test.encodedcc.edu')
 
         tests = [
-            ('/experiments', 'http://test.encodedcc.edu/experiments'),
+            ('/experiments', 'https://test.encodedcc.edu/experiments'),
             ('/experiments/ENCLB045ZZZ',
-             'http://test.encodedcc.edu/experiments/ENCLB045ZZZ'),
-            ('http://submit.encodedcc.edu/experiments/ENCLB045ZZZ',
-             'http://submit.encodedcc.edu/experiments/ENCLB045ZZZ'),
+             'https://test.encodedcc.edu/experiments/ENCLB045ZZZ'),
+            ('https://www.encodedcc.edu/experiments/ENCLB045ZZZ',
+             'https://www.encodedcc.edu/experiments/ENCLB045ZZZ'),
         ]
         for url, result in tests:
             self.assertEqual(encode.prepare_url(url), result)
@@ -66,7 +66,7 @@ class TestEncoded(TestCase):
         encode = ENCODED('test.encodedcc.org')
         url = encode.prepare_url(library['@id'])
         context = encode.create_jsonld_context(library, url)
-        self.assertEqual(context['@vocab'], 'http://test.encodedcc.org/profiles/library.json#')
+        self.assertEqual(context['@vocab'], 'https://test.encodedcc.org/profiles/library.json#')
         self.assertEqual(context['award'], linked_id )
         self._verify_context(context, 'library')
         # namespaces not added yet.
@@ -185,5 +185,5 @@ def suite():
     return suite
 
 if __name__ == "__main__":
-    from unittest2 import main
+    from unittest import main
     main(defaultTest='suite')