1 new changeset in galaxy-central:
http://bitbucket.org/galaxy/galaxy-central/changeset/7e31d5c0a42d/
changeset: r5106:7e31d5c0a42d
user: dan
date: 2011-02-22 22:56:11
summary: Allow toolbox tests to upload a file found located in subdirectories. Fix a bug occurring on the determination of uploaded dataset name during the handling of the removal of .gzip or .zip extension from the uploaded filenames within the toolbox test framework.
affected #: 1 file (127 bytes)
--- a/test/functional/test_toolbox.py Tue Feb 22 15:31:57 2011 -0500
+++ b/test/functional/test_toolbox.py Tue Feb 22 16:56:11 2011 -0500
@@ -1,4 +1,5 @@
import sys, new
+import os.path
from galaxy.tools.parameters import grouping
from galaxy.tools.parameters import basic
from base.twilltestcase import TwillTestCase
@@ -58,8 +59,9 @@
if value:
for end in [ '.zip', '.gz' ]:
if value.endswith( end ):
- value = value.rstrip( end )
+ value = value[ :-len( end ) ]
break
+ value = os.path.basename( value ) #if uploading a file in a path other than root of test-data
all_inputs[ name ] = value
# See if we have a grouping.Repeat element
repeat_name = None
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
1 new changeset in galaxy-central:
http://bitbucket.org/galaxy/galaxy-central/changeset/b26e5c6ff96d/
changeset: r5101:b26e5c6ff96d
user: natefoo
date: 2011-02-21 22:25:35
summary: Update bowtie_wrapper and bowtie_color_wrapper to use test data from the external test data repository
affected #: 2 files (428 bytes)
--- a/tools/sr_mapping/bowtie_color_wrapper.xml Mon Feb 21 15:54:22 2011 -0500
+++ b/tools/sr_mapping/bowtie_color_wrapper.xml Mon Feb 21 16:25:35 2011 -0500
@@ -396,8 +396,7 @@
chrM_color needs to be the base location/name of the index files.
--><param name="genomeSource" value="indexed" />
- <!-- this is the backwards-compatible "unique value" for this index, not an actual path -->
- <param name="index" value="/galaxy/data/equCab2_chrM/bowtie_index/cs/chrM" />
+ <param name="index" value="equCab2chrM" /><param name="sPaired" value="single" /><param name="sInput1" ftype="fastqcssanger" value="bowtie_in1.fastqcssanger" /><param name="sSettingsType" value="preSet" />
@@ -466,8 +465,7 @@
chrM_base is the index files' location/base name.
--><param name="genomeSource" value="indexed" />
- <!-- this is the backwards-compatible "unique value" for this index, not an actual path -->
- <param name="index" value="/galaxy/data/equCab2_chrM/bowtie_index/cs/chrM" />
+ <param name="index" value="equCab2chrM" /><param name="sPaired" value="single" /><param name="sInput1" ftype="fastqcssanger" value="bowtie_in1.fastqcssanger" /><param name="sSettingsType" value="full" />
--- a/tools/sr_mapping/bowtie_wrapper.xml Mon Feb 21 15:54:22 2011 -0500
+++ b/tools/sr_mapping/bowtie_wrapper.xml Mon Feb 21 16:25:35 2011 -0500
@@ -379,8 +379,7 @@
chrM_base needs to be the base location/name of the index files.
--><param name="genomeSource" value="indexed" />
- <!-- this is the backwards-compatible "unique value" for this index, not an actual path -->
- <param name="index" value="/galaxy/data/equCab2_chrM/bowtie_index/chrM" />
+ <param name="index" value="equCab2chrM" /><param name="sPaired" value="single" /><param name="sInput1" ftype="fastqsanger" value="bowtie_in2.fastqsanger" /><param name="sSettingsType" value="preSet" />
@@ -448,7 +447,7 @@
--><param name="genomeSource" value="indexed" /><!-- this is the backwards-compatible "unique value" for this index, not an actual path -->
- <param name="index" value="/galaxy/data/equCab2_chrM/bowtie_index/chrM" />
+ <param name="index" value="equCab2chrM" /><param name="sPaired" value="single" /><param name="sInput1" ftype="fastqsanger" value="bowtie_in2.fastqsanger" /><param name="sSettingsType" value="full" />
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.