Skip to content

Commit 711e66d

Browse files
committed
update nftignore and snapshots for salmon and kallisto
1 parent a94823a commit 711e66d

File tree

5 files changed

+81
-82
lines changed

5 files changed

+81
-82
lines changed

tests/.nftignore

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,21 @@ kallisto/kallisto.*
77
multiqc/multiqc_report.html
88
multiqc/multiqc_report_data/fastqc_trimmed_top_overrepresented_sequences_table.txt
99
multiqc/multiqc_report_data/kallisto_alignment.txt
10+
multiqc/multiqc_report_data/multiqc.log
1011
multiqc/multiqc_report_data/multiqc_data.json
1112
multiqc/multiqc_report_data/multiqc_general_stats.txt
1213
multiqc/multiqc_report_data/multiqc_kallisto.txt
14+
multiqc/multiqc_report_data/multiqc_salmon.txt
1315
multiqc/multiqc_report_data/multiqc_software_versions.txt
1416
multiqc/multiqc_report_data/multiqc_sources.txt
17+
multiqc/multiqc_report_data/salmon_plot.txt
1518
multiqc/multiqc_report_plots/{pdf,png,svg}/*.{pdf,png,svg}
1619
pipeline_info/*.{html,json,txt,yml}
20+
salmon/*/aux_info/fld.gz
21+
salmon/*/aux_info/meta_info.json
22+
salmon/*/libParams/flenDist.txt
23+
salmon/*/logs/salmon_quant.log
24+
salmon/*/quant.genes.sf
25+
salmon/*/quant.sf
26+
salmon/salmon.*
1727
trimgalore/*fastq.gz_trimming_report.txt

tests/kallisto.nf.test

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ nextflow_pipeline {
5050

5151
then {
5252
// stable_name: All files + folders in ${params.outdir}/ with a stable name
53-
def stable_name = getAllFilesFromDir(params.outdir, true, ['pipeline_info/*.{html,json,txt}'], null)
53+
def stable_name = getAllFilesFromDir(params.outdir, relative: true, includeDir: true, ignore: ['pipeline_info/*.{html,json,txt}'])
5454
// stable_path: All files in ${params.outdir}/ with stable content
55-
def stable_path = getAllFilesFromDir(params.outdir, false, null, 'tests/.nftignore')
55+
def stable_path = getAllFilesFromDir(params.outdir, ignoreFile: 'tests/.nftignore')
5656
assertAll(
5757
{ assert workflow.success},
5858
{ assert snapshot(
@@ -61,7 +61,7 @@ nextflow_pipeline {
6161
// pipeline versions.yml file for multiqc from which Nextflow version is removed because we tests pipelines on multiple Nextflow versions
6262
removeNextflowVersion("$outputDir/pipeline_info/nf_core_rnaseq_software_mqc_versions.yml"),
6363
// All stable path name, with a relative path
64-
getRelativePath(stable_name, outputDir),
64+
stable_name,
6565
// All files with stable contents
6666
stable_path
6767
).match() }

tests/kallisto.nf.test.snap

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,6 @@
244244
"fastqc_trimmed_per_sequence_quality_scores_plot.txt:md5,0f9834cc19f76dd5c87cf8cba7435a7c",
245245
"fastqc_trimmed_sequence_counts_plot.txt:md5,6ae4db60425cae4f78b13c798ad1dcf3",
246246
"fastqc_trimmed_sequence_duplication_levels_plot.txt:md5,c73407d55fc532e864fa1dc8dbc12874",
247-
"multiqc.log:md5,8ad099f7085cbd858f2a8feadd603c71",
248247
"multiqc_citations.txt:md5,4cece87a056a29c1338277736855e6ee",
249248
"multiqc_cutadapt.txt:md5,aac9581a5670cb55edf564f3d6c1f9a7",
250249
"multiqc_fastqc_fastqc_trimmed.txt:md5,26528b0b0d3df6304b80ca8f09619233"

tests/salmon.nf.test

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ nextflow_pipeline {
1616

1717
then {
1818
// stable_name: All files + folders in ${params.outdir}/ with a stable name
19-
def stable_name = getAllFilesFromDir(params.outdir, true, ['pipeline_info/*.{html,json,txt}'], null)
19+
def stable_name = getAllFilesFromDir(params.outdir, relative: true, includeDir: true, ignore: ['pipeline_info/*.{html,json,txt}'])
2020
// stable_path: All files in ${params.outdir}/ with stable content
21-
def stable_path = getAllFilesFromDir(params.outdir, false, null, 'tests/.nftignore')
21+
def stable_path = getAllFilesFromDir(params.outdir, ignoreFile: 'tests/.nftignore')
2222
assertAll(
2323
{ assert workflow.success},
2424
{ assert snapshot(
@@ -27,7 +27,7 @@ nextflow_pipeline {
2727
// pipeline versions.yml file for multiqc from which Nextflow version is removed because we tests pipelines on multiple Nextflow versions
2828
removeNextflowVersion("$outputDir/pipeline_info/nf_core_rnaseq_software_mqc_versions.yml"),
2929
// All stable path name, with a relative path
30-
getRelativePath(stable_name, outputDir),
30+
stable_name,
3131
// All files with stable contents
3232
stable_path
3333
).match() }
@@ -50,9 +50,9 @@ nextflow_pipeline {
5050

5151
then {
5252
// stable_name: All files + folders in ${params.outdir}/ with a stable name
53-
def stable_name = getAllFilesFromDir(params.outdir, true, ['pipeline_info/*.{html,json,txt}'], null)
53+
def stable_name = getAllFilesFromDir(params.outdir, relative: true, includeDir: true, ignore: ['pipeline_info/*.{html,json,txt}'])
5454
// stable_path: All files in ${params.outdir}/ with stable content
55-
def stable_path = getAllFilesFromDir(params.outdir, false, null, 'tests/.nftignore')
55+
def stable_path = getAllFilesFromDir(params.outdir, ignoreFile: 'tests/.nftignore')
5656
assertAll(
5757
{ assert workflow.success},
5858
{ assert snapshot(
@@ -61,7 +61,7 @@ nextflow_pipeline {
6161
// pipeline versions.yml file for multiqc from which Nextflow version is removed because we tests pipelines on multiple Nextflow versions
6262
removeNextflowVersion("$outputDir/pipeline_info/nf_core_rnaseq_software_mqc_versions.yml"),
6363
// All stable path name, with a relative path
64-
getRelativePath(stable_name, outputDir),
64+
stable_name,
6565
// All files with stable contents
6666
stable_path
6767
).match() }

0 commit comments

Comments
 (0)