From 9d98f10767d7c43e979720ba8a9badee86501c78 Mon Sep 17 00:00:00 2001 From: Peter van 't Hof Date: Thu, 6 Jul 2017 20:23:10 +0200 Subject: [PATCH] Adding test tool --- lib/galaxy/datatypes/tabular.py | 4 +-- test/functional/tools/samples_tool_conf.xml | 1 + test/functional/tools/vcf_bgzip.xml | 30 +++++++++++++++++++++ 3 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 test/functional/tools/vcf_bgzip.xml diff --git a/lib/galaxy/datatypes/tabular.py b/lib/galaxy/datatypes/tabular.py index 0736d4f7429..11ac1d079e4 100644 --- a/lib/galaxy/datatypes/tabular.py +++ b/lib/galaxy/datatypes/tabular.py @@ -741,7 +741,7 @@ class VcfGz( BaseVcf, binary.Binary): extension = 'vcf.gz' compressed = True - MetadataElement( name="vcf_gz_index", desc="Vcf Index File", param=metadata.FileParameter, file_ext="tbi", readonly=True, no_value=None, visible=False, optional=True ) + MetadataElement( name="tabix_index", desc="Vcf Index File", param=metadata.FileParameter, file_ext="tbi", readonly=True, no_value=None, visible=False, optional=True ) def set_meta( self, dataset, **kwd ): super(BaseVcf, self).set_meta(dataset, **kwd) @@ -749,7 +749,7 @@ class VcfGz( BaseVcf, binary.Binary): # These metadata values are not accessible by users, always overwrite index_file = dataset.metadata.bcf_index if not index_file: - index_file = dataset.metadata.spec['vcf_gz_index'].param.new_file( dataset=dataset ) + index_file = dataset.metadata.spec['tabix_index'].param.new_file( dataset=dataset ) # Create the bcf index # $ bcftools index # Usage: bcftools index diff --git a/test/functional/tools/samples_tool_conf.xml b/test/functional/tools/samples_tool_conf.xml index 4197eb61b5f..839b888bb92 100644 --- a/test/functional/tools/samples_tool_conf.xml +++ b/test/functional/tools/samples_tool_conf.xml @@ -25,6 +25,7 @@ + diff --git a/test/functional/tools/vcf_bgzip.xml b/test/functional/tools/vcf_bgzip.xml new file mode 100644 index 00000000000..a72077c089b --- /dev/null +++ b/test/functional/tools/vcf_bgzip.xml @@ -0,0 +1,30 @@ + + + bcftools + + input.vcf.gz.tbi.md5 && + cp $input.metadata.vcf_gz_index input.vcf.gz.tbi && + md5check -c vcf.gz.tbi.md5 && + cp $input $output + ]]> + + + + + + + + + + + + + + + +