Change unittest2 back into unittest.

[htsworkflow.git] / htsworkflow / pipelines / test / test_runfolder_utils.py

diff --git a/htsworkflow/pipelines/test/test_runfolder_utils.py b/htsworkflow/pipelines/test/test_runfolder_utils.py
index 59ee418928f6b84b7317c60a62f074894701d430..5471c18f1b64b5ab45b5e7ddd37179a1970fd3b3 100644 (file)
--- a/htsworkflow/pipelines/test/test_runfolder_utils.py
+++ b/htsworkflow/pipelines/test/test_runfolder_utils.py
@@ -1,4 +1,4 @@
-from unittest2 import TestCase, TestSuite, defaultTestLoader
+from unittest import TestCase, TestSuite, defaultTestLoader
 
 from htsworkflow.pipelines import runfolder
 class TestRunfolderUtilities(TestCase):
@@ -10,10 +10,10 @@ class TestRunfolderUtilities(TestCase):
 
         matches = set(runfolder.hiseq_match_aligned_unaligned(aligned, unaligned))
         self.assertEqual(len(matches), 4)
-        self.assertTrue(('/a/b/c/Aligned', '/a/b/c/Unaligned') in matches )
-        self.assertTrue(('/a/b/c/Aligned1234', None) in matches )
-        self.assertTrue(('/a/b/c/Aligned_3mm', '/a/b/c/Unaligned_3mm') in matches )
-        self.assertTrue((None, '/a/b/c/Unaligned_6index') in matches )
+        self.assertTrue(('/a/b/c/Aligned', '/a/b/c/Unaligned', '') in matches )
+        self.assertTrue(('/a/b/c/Aligned1234', None, '1234') in matches )
+        self.assertTrue(('/a/b/c/Aligned_3mm', '/a/b/c/Unaligned_3mm', '_3mm') in matches )
+        self.assertTrue((None, '/a/b/c/Unaligned_6index', '_6index') in matches )
 
     def test_match_aligned_unaligned_relpath(self):
         aligned = ['./Aligned', './Aligned1234', './Aligned_3mm']
@@ -21,10 +21,10 @@ class TestRunfolderUtilities(TestCase):
 
         matches = set(runfolder.hiseq_match_aligned_unaligned(aligned, unaligned))
         self.assertEqual(len(matches), 4)
-        self.assertTrue(('./Aligned', './Unaligned') in matches )
-        self.assertTrue(('./Aligned1234', None) in matches )
-        self.assertTrue(('./Aligned_3mm', './Unaligned_3mm') in matches )
-        self.assertTrue((None, './Unaligned_6index') in matches )
+        self.assertTrue(('./Aligned', './Unaligned', '') in matches )
+        self.assertTrue(('./Aligned1234', None, '1234') in matches )
+        self.assertTrue(('./Aligned_3mm', './Unaligned_3mm', '_3mm') in matches )
+        self.assertTrue((None, './Unaligned_6index', '_6index') in matches )
 
 def suite():
     suite = TestSuite()
@@ -32,5 +32,5 @@ def suite():
     return suite
 
 if __name__ == "__main__":
-    from unittest2 import main
+    from unittest import main
     main(defaultTest="suite")