Initial port to python3

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

diff --git a/htsworkflow/submission/test/test_results.py b/htsworkflow/submission/test/test_results.py
index e4d28cfd20c1da4f5b5a642f4b02511c808a08b0..479ef0ffaf4ef9edd420d155284a9ef3a9dc37c6 100644 (file)
--- a/htsworkflow/submission/test/test_results.py
+++ b/htsworkflow/submission/test/test_results.py
@@ -3,10 +3,10 @@
 from pprint import pprint
 import shutil
 
-from unittest2 import TestCase, defaultTestLoader
+from unittest import TestCase, defaultTestLoader
 
 from htsworkflow.submission.results import ResultMap
-from submission_test_common import *
+from .submission_test_common import *
 
 def generate_sample_results_tree(obj):
     obj.tempdir = tempfile.mkdtemp(prefix="results_test")
@@ -43,7 +43,7 @@ class TestResultMap(TestCase):
         results['2000'] = 'dir2000'
         results['1500'] = 'dir1500'
 
-        self.failUnlessEqual(results.keys(), ['1000', '2000', '1500'])
+        self.failUnlessEqual(list(results.keys()), ['1000', '2000', '1500'])
         self.failUnlessEqual(list(results.values()),
                              ['dir1000', 'dir2000', 'dir1500'])
         self.failUnlessEqual(list(results.items()),
@@ -55,9 +55,9 @@ class TestResultMap(TestCase):
         self.failUnlessEqual(results['1500'], 'dir1500')
         self.failUnlessEqual(results['2000'], 'dir2000')
 
-        self.assertTrue(u'2000' in results)
         self.assertTrue('2000' in results)
-        self.assertFalse(u'77777' in results)
+        self.assertTrue('2000' in results)
+        self.assertFalse('77777' in results)
         self.assertFalse('77777' in results)
 
     def test_make_from_absolute(self):
@@ -104,5 +104,5 @@ def suite():
 if __name__ == "__main__":
     import logging
     logging.basicConfig(level=logging.DEBUG)
-    from unittest2 import main
+    from unittest import main
     main(defaultTest='suite')