Skip to content

Commit

Permalink
Remove pytest-workflow tests for modules covered by nf-test (#4521)
Browse files Browse the repository at this point in the history
* Add first pass at the script

* rmdir => rm -rf

Never used rmdir before

* Remove pytest-workflow tests for modules covered by nf-test

* Use yq to remove tags

* ci: Remove modules that didn't get their tags removed

* Copy over fastqc tests todo

* chore: Bump snapshot for fastqc
  • Loading branch information
edmundmiller authored Dec 4, 2023
1 parent 3aaf92f commit 3e8b0c1
Show file tree
Hide file tree
Showing 281 changed files with 87 additions and 6,867 deletions.
12 changes: 12 additions & 0 deletions .github/remove_pytest.bash
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/usr/bin/env cached-nix-shell
#! nix-shell -i bash -p fd yq-go


# Find modules that have a tests directory
tested=$(fd main.nf.test modules/)

for module in $tested; do
clean=$(dirname $module | sed 's|/tests||' | sed 's|modules/nf-core/||')
yq -i "del(.${clean})" tests/config/pytest_modules.yml
# rm -rf "tests/${clean}"
done
68 changes: 68 additions & 0 deletions modules/nf-core/fastqc/tests/main.nf.test
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,72 @@ nextflow_process {
)
}
}
// TODO
// //
// // Test with paired-end data
// //
// workflow test_fastqc_paired_end {
// input = [
// [id: 'test', single_end: false], // meta map
// [
// file(params.test_data['sarscov2']['illumina']['test_1_fastq_gz'], checkIfExists: true),
// file(params.test_data['sarscov2']['illumina']['test_2_fastq_gz'], checkIfExists: true)
// ]
// ]

// FASTQC ( input )
// }

// //
// // Test with interleaved data
// //
// workflow test_fastqc_interleaved {
// input = [
// [id: 'test', single_end: false], // meta map
// file(params.test_data['sarscov2']['illumina']['test_interleaved_fastq_gz'], checkIfExists: true)
// ]

// FASTQC ( input )
// }

// //
// // Test with bam data
// //
// workflow test_fastqc_bam {
// input = [
// [id: 'test', single_end: false], // meta map
// file(params.test_data['sarscov2']['illumina']['test_paired_end_sorted_bam'], checkIfExists: true)
// ]

// FASTQC ( input )
// }

// //
// // Test with multiple samples
// //
// workflow test_fastqc_multiple {
// input = [
// [id: 'test', single_end: false], // meta map
// [
// file(params.test_data['sarscov2']['illumina']['test_1_fastq_gz'], checkIfExists: true),
// file(params.test_data['sarscov2']['illumina']['test_2_fastq_gz'], checkIfExists: true),
// file(params.test_data['sarscov2']['illumina']['test2_1_fastq_gz'], checkIfExists: true),
// file(params.test_data['sarscov2']['illumina']['test2_2_fastq_gz'], checkIfExists: true)
// ]
// ]

// FASTQC ( input )
// }

// //
// // Test with custom prefix
// //
// workflow test_fastqc_custom_prefix {
// input = [
// [ id:'mysample', single_end:true ], // meta map
// file(params.test_data['sarscov2']['illumina']['test_1_fastq_gz'], checkIfExists: true)
// ]

// FASTQC ( input )
// }
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 0 additions & 16 deletions tests/config/pytest_modules.yml
Original file line number Diff line number Diff line change
Expand Up @@ -495,10 +495,6 @@ canu:
- modules/nf-core/canu/**
- tests/modules/nf-core/canu/**

cat/fastq:
- modules/nf-core/cat/fastq/**
- tests/modules/nf-core/cat/fastq/**

cdhit/cdhitest:
- modules/nf-core/cdhit/cdhitest/**
- tests/modules/nf-core/cdhit/cdhitest/**
Expand Down Expand Up @@ -1015,10 +1011,6 @@ fastk/merge:
- modules/nf-core/fastk/merge/**
- tests/modules/nf-core/fastk/merge/**

fastqc:
- modules/nf-core/fastqc/**
- tests/modules/nf-core/fastqc/**

fasttree:
- modules/nf-core/fasttree/**
- tests/modules/nf-core/fasttree/**
Expand Down Expand Up @@ -2971,10 +2963,6 @@ samtools/reheader:
- modules/nf-core/samtools/reheader/**
- tests/modules/nf-core/samtools/reheader/**

samtools/sort:
- modules/nf-core/samtools/sort/**
- tests/modules/nf-core/samtools/sort/**

samtools/view:
- modules/nf-core/samtools/view/**
- tests/modules/nf-core/samtools/view/**
Expand Down Expand Up @@ -3244,10 +3232,6 @@ smoove/call:
- modules/nf-core/smoove/call/**
- tests/modules/nf-core/smoove/call/**

snakemake:
- modules/nf-core/snakemake/**
- tests/modules/nf-core/snakemake/**

snapaligner/align:
- modules/nf-core/snapaligner/align/**
- tests/modules/nf-core/snapaligner/align/**
Expand Down
15 changes: 0 additions & 15 deletions tests/modules/nf-core/abricate/run/main.nf

This file was deleted.

5 changes: 0 additions & 5 deletions tests/modules/nf-core/abricate/run/nextflow.config

This file was deleted.

10 changes: 0 additions & 10 deletions tests/modules/nf-core/abricate/run/test.yml

This file was deleted.

21 changes: 0 additions & 21 deletions tests/modules/nf-core/abricate/summary/main.nf

This file was deleted.

5 changes: 0 additions & 5 deletions tests/modules/nf-core/abricate/summary/nextflow.config

This file was deleted.

14 changes: 0 additions & 14 deletions tests/modules/nf-core/abricate/summary/test.yml

This file was deleted.

31 changes: 0 additions & 31 deletions tests/modules/nf-core/art/illumina/main.nf

This file was deleted.

12 changes: 0 additions & 12 deletions tests/modules/nf-core/art/illumina/nextflow.config

This file was deleted.

58 changes: 0 additions & 58 deletions tests/modules/nf-core/art/illumina/test.yml

This file was deleted.

13 changes: 0 additions & 13 deletions tests/modules/nf-core/assemblyscan/main.nf

This file was deleted.

5 changes: 0 additions & 5 deletions tests/modules/nf-core/assemblyscan/nextflow.config

This file was deleted.

7 changes: 0 additions & 7 deletions tests/modules/nf-core/assemblyscan/test.yml

This file was deleted.

Loading

0 comments on commit 3e8b0c1

Please sign in to comment.