From: Diane Trout <diane@ghic.org>
Date: Fri, 20 Mar 2015 23:26:04 +0000 (-0700)
Subject: Use regex to make sure scripts end with the right command
X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=htsworkflow.git;a=commitdiff_plain;h=813116cccde15dbe9db504689a117787536cba31

Use regex to make sure scripts end with the right command

python 3 doesn't seem to return the path to a .pyc file
like python 2.
---

diff --git a/htsworkflow/submission/test/test_condorfastq.py b/htsworkflow/submission/test/test_condorfastq.py
index 2d23271..400b4db 100644
--- a/htsworkflow/submission/test/test_condorfastq.py
+++ b/htsworkflow/submission/test/test_condorfastq.py
@@ -2,6 +2,7 @@
 
 import copy
 import os
+import re
 from pprint import pprint
 import shutil
 import tempfile
@@ -598,30 +599,30 @@ class TestCondorFastq(TestCase):
         split_test = dict((( x['target'], x) for x in
             [{'sources': [u'11154_NoIndex_L003_R1_001.fastq.gz',
                          u'11154_NoIndex_L003_R1_002.fastq.gz'],
-             'pyscript': 'desplit_fastq.pyc',
+             'pyscript': 'desplit_fastq.pyc?$',
              'target': u'11154_C02F9ACXX_c202_l3_r1.fastq'},
             {'sources': [u'11154_NoIndex_L003_R2_001.fastq.gz',
                          u'11154_NoIndex_L003_R2_002.fastq.gz'],
-             'pyscript': 'desplit_fastq.pyc',
+             'pyscript': 'desplit_fastq.pyc?$',
              'target': u'11154_C02F9ACXX_c202_l3_r2.fastq'},
             {'sources': [u'12345_CGATGT_L003_R1_001.fastq.gz',
                          u'12345_CGATGT_L003_R1_002.fastq.gz',
                          u'12345_CGATGT_L003_R1_003.fastq.gz',
                          ],
-             'pyscript': 'desplit_fastq.pyc',
+             'pyscript': 'desplit_fastq.pyc?$',
              'target': u'12345_C02F9ACXX_c202_l3_r1.fastq'},
             {'sources': [u'12345_CGATGT_L003_R2_001.fastq.gz',
                          u'12345_CGATGT_L003_R2_002.fastq.gz',
                          u'12345_CGATGT_L003_R2_003.fastq.gz',
                          ],
-             'pyscript': 'desplit_fastq.pyc',
+             'pyscript': 'desplit_fastq.pyc?$',
              'target': u'12345_C02F9ACXX_c202_l3_r2.fastq'}
              ]
          ))
         for arg in split:
             _, target = os.path.split(arg['target'])
             pyscript = split_test[target]['pyscript']
-            self.assertTrue(arg['pyscript'].endswith(pyscript))
+            self.assertTrue(re.search(pyscript, arg['pyscript']))
             filename = split_test[target]['target']
             self.assertTrue(arg['target'].endswith(filename))
             for s_index in range(len(arg['sources'])):