1 new changeset in galaxy-central:
http://bitbucket.org/galaxy/galaxy-central/changeset/07275d9052af/
changeset: r5118:07275d9052af
user: rc
date: 2011-02-24 18:16:33
summary: Adding ftype attribute to vcf tool tests
affected #: 3 files (142 bytes)
--- a/lib/galaxy/tools/parameters/basic.py Thu Feb 24 09:17:50 2011 -0500
+++ b/lib/galaxy/tools/parameters/basic.py Thu Feb 24 12:16:33 2011 -0500
@@ -202,7 +202,7 @@
except:
raise ValueError( "An integer is required" )
elif self.value is None:
- raise ValueError( "The settings for this field require a 'value'
setting and optionally a default value which must be an integer" )
+ raise ValueError( "The settings for the field named '%s' require
a 'value' setting and optionally a default value which must be an integer" %
self.name )
self.min = elem.get( 'min' )
self.max = elem.get( 'max' )
if self.min:
--- a/tools/vcf_tools/annotate.xml Thu Feb 24 09:17:50 2011 -0500
+++ b/tools/vcf_tools/annotate.xml Thu Feb 24 12:16:33 2011 -0500
@@ -31,15 +31,15 @@
</outputs><tests><test>
- <param name="input1" value="test.small.vcf" />
+ <param name="input1" value="test.small.vcf"
ftype="vcf" /><param name="annotate" value="dbsnp"
/>
- <param name="input2" value="dbsnp.small.vcf" />
+ <param name="input2" value="dbsnp.small.vcf"
ftype="vcf" /><output name="output"
file="test_annotated_dbsnp.vcf" lines_diff="6" ftype="vcf"
/></test><test>
- <param name="input1" value="test.small.vcf" />
+ <param name="input1" value="test.small.vcf"
ftype="vcf" /><param name="annotate" value="hapmap"
/>
- <param name="input2" value="hapmap.small.vcf" />
+ <param name="input2" value="hapmap.small.vcf"
ftype="vcf" /><output name="output"
file="test_annotated_hapmap.vcf" lines_diff="6" ftype="vcf"
/></test></tests>
--- a/tools/vcf_tools/intersect.xml Thu Feb 24 09:17:50 2011 -0500
+++ b/tools/vcf_tools/intersect.xml Thu Feb 24 12:16:33 2011 -0500
@@ -41,23 +41,23 @@
</outputs><tests><test>
- <param name="input1" value="1.vcf" />
+ <param name="input1" value="1.vcf" ftype="vcf"
/><param name="format" value="vcf" />
- <param name="input2" value="2.vcf" />
+ <param name="input2" value="2.vcf" ftype="vcf"
/><param name="priority_file" value="none" /><output
name="output" file="1_2_intersect_priority_0.vcf"
lines_diff="2" ftype="vcf" /></test><test>
- <param name="input1" value="1.vcf" />
+ <param name="input1" value="1.vcf" ftype="vcf"
/><param name="format" value="vcf" />
- <param name="input2" value="2.vcf" />
+ <param name="input2" value="2.vcf" ftype="vcf"
/><param name="priority_file" value="first_file" /><output
name="output" file="1_2_intersect_priority_1.vcf"
lines_diff="2" ftype="vcf" /></test><test>
- <param name="input1" value="1.vcf" />
+ <param name="input1" value="1.vcf" ftype="vcf"
/><param name="format" value="vcf" />
- <param name="input2" value="2.vcf" />
+ <param name="input2" value="2.vcf" ftype="vcf"
/><param name="priority_file" value="second_file"
/><output name="output" file="1_2_intersect_priority_2.vcf"
lines_diff="2" ftype="vcf" /></test>
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.