X-Git-Url: http://woldlab.caltech.edu/gitweb/?a=blobdiff_plain;f=htsworkflow%2Fpipelines%2Ftest%2Ftest_runfolder_utils.py;h=e7c0c3807d950e18cdb854c86932c8247e4b45f1;hb=8f158098e06b0b982328ea727cb9aba291ac802a;hp=59ee418928f6b84b7317c60a62f074894701d430;hpb=fc458343b8f4f15b761e9ed58d96430865e34d3a;p=htsworkflow.git diff --git a/htsworkflow/pipelines/test/test_runfolder_utils.py b/htsworkflow/pipelines/test/test_runfolder_utils.py index 59ee418..e7c0c38 100644 --- a/htsworkflow/pipelines/test/test_runfolder_utils.py +++ b/htsworkflow/pipelines/test/test_runfolder_utils.py @@ -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()