Skip to content

Commit 2614679

Browse files
authored
Merge pull request wtsi-npg#871 from mgcam/test_fixes4lane-level_robo
Updated tests for autoqc review job creation.
2 parents df64b11 + 60a011f commit 2614679

File tree

3 files changed

+18
-15
lines changed

3 files changed

+18
-15
lines changed

Changes

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
LIST OF CHANGES
22
---------------
33

4+
- Changed/extended tests for npg_pipeline::function::autoqc to ensure that
5+
the tests work with changes in https://github.com/wtsi-npg/npg_qc/pull/895
6+
(study_specific assessment is disabled for lanes). Tested that a pools that
7+
has samples from multiple studies does not cause problems.
8+
49
release 68.7.0 (2024-12-02)
510
- npg_pipeline::function::autoqc
611
- Simplified the flow of the code.

t/20-function-autoqc.t

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ use File::Slurp;
88
use Log::Log4perl qw/:levels/;
99

1010
use t::util;
11-
12-
use_ok('npg_pipeline::function::autoqc');
1311
use_ok('st::api::lims');
12+
use_ok('npg_pipeline::function::autoqc');
1413
use_ok('npg_tracking::glossary::composition');
1514
use_ok('npg_tracking::glossary::rpt');
1615
use_ok('npg_pipeline::product');
@@ -604,24 +603,16 @@ subtest 'review' => sub {
604603
);
605604

606605
$da = $qc->create();
607-
ok ($da && (@{$da} == 10), '10 definitions returned');
606+
ok ($da && (@{$da} == 9), '9 definitions returned');
608607
my %definitions = map { $_->composition->freeze2rpt => $_ } @{$da};
609608
my @expected_rpt_lists = qw/ 8747:1:1 8747:1:2 8747:1:3
610609
8747:2:4 8747:2:5 8747:2:6
611-
8747:3:7 8747:3:8 8747:3:9
612-
8747:7 /;
610+
8747:3:7 8747:3:8 8747:3:9 /;
613611
is_deeply ([sort keys %definitions], \@expected_rpt_lists,
614612
'definitions are for correct entities');
615613

616-
my $d = $definitions{'8747:7'};
617-
my $expected_command = q{qc --check=review --rpt_list="8747:7" } .
618-
qq{--filename_root=8747_7 --qc_out=$archive_dir/lane7/qc } .
619-
qq{--qc_in=$archive_dir/lane7/qc --conf_path=t/data/release/config/qc_review } .
620-
qq{--runfolder_path=$rf_path};
621-
is ($d->command, $expected_command, 'correct command for lane-level job');
622-
623-
$d = $definitions{'8747:1:1'};
624-
$expected_command = q{qc --check=review --rpt_list="8747:1:1" } .
614+
my $d = $definitions{'8747:1:1'};
615+
my $expected_command = q{qc --check=review --rpt_list="8747:1:1" } .
625616
qq{--filename_root=8747_1#1 --qc_out=$archive_dir/lane1/plex1/qc } .
626617
qq{--qc_in=$archive_dir/lane1/plex1/qc --conf_path=t/data/release/config/qc_review } .
627618
qq{--runfolder_path=$rf_path};
@@ -654,6 +645,13 @@ subtest 'review' => sub {
654645
resource => $default
655646
);
656647

648+
# Lane 6 has samples from two studies - should not cause problems
649+
# creating jobs.
650+
my $with_control = 0;
651+
is_deeply(
652+
[st::api::lims->new(id_run => 8747, position => 6)->study_ids($with_control)],
653+
[qw(2410 82)], 'lane 6 samples belong to two different studies'
654+
);
657655
$da = $qc->create();
658656
ok ($da && (@{$da} == 14), '14 definitions returned');
659657
%definitions = map { $_->composition->freeze2rpt => $_ } @{$da};

t/data/samplesheet_8747.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Lane,Sample_ID,Sample_Name,GenomeFolder,Index,bait_name,default_library_type,def
3131
6,6093527,ERS183152,,TATCTA,,qPCR only,TTAGGCAT,,[email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected],[email protected] [email protected] [email protected] [email protected] [email protected],[email protected] [email protected],[email protected],,0,0,,,dag1_mut2 6093527,zebrafish,7955,S4301,82,ZF molecular phenotype,standard,,,from:70 to:270,ERS183152,,Danio rerio,,3%27 end enriched mRNA from morphologically abnormal embryos from dag1 knockout incross 2. A 6 base indexing sequence (TATCTA) is bases 5 to 10 of read 1 followed by polyT. More information describing the mutant phenotype can be found at the Wellcome Trust Sanger Institute Zebrafish Mutation Project website http%3A%2F%2Fwww.sanger.ac.uk%2Fcgi-bin%2FProjects%2FD_rerio%2Fzmp%2Fsearch.pl%3Fq%3Dzmp_phD,,1503351,dag1_mut2,Zebrafish dag1 mut2,Danio_rerio (zv9),,168,ERP001559,1,0,0,Total RNA was extracted from wild type and mutant zebrafish embryos. Double stranded cDNA representing the 3%27 ends of transcripts was made by a variety of methods%2C including polyT priming and 3%27 pull down on magentic beads. Some samples included indexing test experiments where a sequence barcode was placed within one of the sequence reads.. This data is part of a pre-publication release. For information on the proper use of pre-publication data shared by the Wellcome Trust Sanger Institute (including details of any publication moratoria)%2C please see http%3A%2F%2Fwww.sanger.ac.uk%2Fdatasharing%2F,82,ZF molecular phenotype,,,Zebrafish transcript profiling,3,
3232
6,6093528,ERS183153,,AAGTTA,,qPCR only,TGACCACT,,[email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected],[email protected] [email protected] [email protected] [email protected] [email protected],[email protected] [email protected],[email protected],,0,0,,,dag1_wt2 6093528,zebrafish,7955,S4301,82,ZF molecular phenotype,standard,,,from:70 to:270,ERS183153,,Danio rerio,,3%27 end enriched mRNA from morphologically normal sibling embryos from dag1 knockout incross 2. A 6 base indexing sequence (AAGTTA) is bases 5 to 10 of read 1 followed by polyT. More information describing the mutant phenotype can be found at the Wellcome Trust Sanger Institute Zebrafish Mutation Project website http%3A%2F%2Fwww.sanger.ac.uk%2Fcgi-bin%2FProjects%2FD_rerio%2Fzmp%2Fsearch.pl%3Fq%3Dzmp_phD,,1503352,dag1_wt2,Zebrafish dag1 wt2,Danio_rerio (zv9),,168,ERP001559,1,0,0,Total RNA was extracted from wild type and mutant zebrafish embryos. Double stranded cDNA representing the 3%27 ends of transcripts was made by a variety of methods%2C including polyT priming and 3%27 pull down on magentic beads. Some samples included indexing test experiments where a sequence barcode was placed within one of the sequence reads.. This data is part of a pre-publication release. For information on the proper use of pre-publication data shared by the Wellcome Trust Sanger Institute (including details of any publication moratoria)%2C please see http%3A%2F%2Fwww.sanger.ac.uk%2Fdatasharing%2F,82,ZF molecular phenotype,,,Zebrafish transcript profiling,4,
3333
6,6093529,ERS183154,,GTAGAC,,qPCR only,ACAGTGGT,,[email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected],[email protected] [email protected] [email protected] [email protected] [email protected],[email protected] [email protected],[email protected],,0,0,,,dag1_mut3 6093529,zebrafish,7955,S4301,82,ZF molecular phenotype,standard,,,from:70 to:270,ERS183154,,Danio rerio,,3%27 end enriched mRNA from morphologically abnormal embryos from dag1 knockout incross 3. A 6 base indexing sequence (GTAGAC) is bases 5 to 10 of read 1 followed by polyT. More information describing the mutant phenotype can be found at the Wellcome Trust Sanger Institute Zebrafish Mutation Project website http%3A%2F%2Fwww.sanger.ac.uk%2Fcgi-bin%2FProjects%2FD_rerio%2Fzmp%2Fsearch.pl%3Fq%3Dzmp_phD,,1503353,dag1_mut3,Zebrafish dag1 mut3,Danio_rerio (zv9),,168,ERP001559,1,0,0,Total RNA was extracted from wild type and mutant zebrafish embryos. Double stranded cDNA representing the 3%27 ends of transcripts was made by a variety of methods%2C including polyT priming and 3%27 pull down on magentic beads. Some samples included indexing test experiments where a sequence barcode was placed within one of the sequence reads.. This data is part of a pre-publication release. For information on the proper use of pre-publication data shared by the Wellcome Trust Sanger Institute (including details of any publication moratoria)%2C please see http%3A%2F%2Fwww.sanger.ac.uk%2Fdatasharing%2F,82,ZF molecular phenotype,,,Zebrafish transcript profiling,5,
34-
6,6093530,ERS183155,,TTAATC,,qPCR only,GCCAATGT,,[email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected],[email protected] [email protected] [email protected] [email protected] [email protected],[email protected] [email protected],[email protected],,0,0,,,dag1_wt3 6093530,zebrafish,7955,S4301,82,ZF molecular phenotype,standard,,,from:70 to:270,ERS183155,,Danio rerio,,3%27 end enriched mRNA from morphologically normal sibling embryos from dag1 knockout incross 3. A 6 base indexing sequence (TTAATC) is bases 5 to 10 of read 1 followed by polyT. More information describing the mutant phenotype can be found at the Wellcome Trust Sanger Institute Zebrafish Mutation Project website http%3A%2F%2Fwww.sanger.ac.uk%2Fcgi-bin%2FProjects%2FD_rerio%2Fzmp%2Fsearch.pl%3Fq%3Dzmp_phD,,1503354,dag1_wt3,Zebrafish dag1 wt3,Danio_rerio (zv9),,168,ERP001559,1,0,0,Total RNA was extracted from wild type and mutant zebrafish embryos. Double stranded cDNA representing the 3%27 ends of transcripts was made by a variety of methods%2C including polyT priming and 3%27 pull down on magentic beads. Some samples included indexing test experiments where a sequence barcode was placed within one of the sequence reads.. This data is part of a pre-publication release. For information on the proper use of pre-publication data shared by the Wellcome Trust Sanger Institute (including details of any publication moratoria)%2C please see http%3A%2F%2Fwww.sanger.ac.uk%2Fdatasharing%2F,82,ZF molecular phenotype,,,Zebrafish transcript profiling,6,
34+
6,6093530,ERS183155,,TTAATC,,qPCR only,GCCAATGT,,[email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected],[email protected] [email protected] [email protected] [email protected] [email protected],[email protected] [email protected],[email protected],,0,0,,,dag1_wt3 6093530,zebrafish,7955,S4301,82,ZF molecular phenotype,standard,,,from:70 to:270,ERS183155,,Danio rerio,,3%27 end enriched mRNA from morphologically normal sibling embryos from dag1 knockout incross 3. A 6 base indexing sequence (TTAATC) is bases 5 to 10 of read 1 followed by polyT. More information describing the mutant phenotype can be found at the Wellcome Trust Sanger Institute Zebrafish Mutation Project website http%3A%2F%2Fwww.sanger.ac.uk%2Fcgi-bin%2FProjects%2FD_rerio%2Fzmp%2Fsearch.pl%3Fq%3Dzmp_phD,,1503354,dag1_wt3,Zebrafish dag1 wt3,Danio_rerio (zv9),,168,ERP001559,1,0,0,Total RNA was extracted from wild type and mutant zebrafish embryos. Double stranded cDNA representing the 3%27 ends of transcripts was made by a variety of methods%2C including polyT priming and 3%27 pull down on magentic beads. Some samples included indexing test experiments where a sequence barcode was placed within one of the sequence reads.. This data is part of a pre-publication release. For information on the proper use of pre-publication data shared by the Wellcome Trust Sanger Institute (including details of any publication moratoria)%2C please see http%3A%2F%2Fwww.sanger.ac.uk%2Fdatasharing%2F,2410,ZF molecular phenotype,,,Zebrafish transcript profiling,6,
3535
6,4405872,phiX_for_spiked_buffers,,ACAACGCAAT,,,ACAACGCAAT,,[email protected] [email protected],[email protected],[email protected],[email protected],,1,0,,,PhiX (10Jan12),,,,,,standard,,,,,,,,,,1255141,phiX_for_spiked_buffers,,,,168,,1,0,0,None,198,Illumina Controls,,,,168,
3636
7,6101639,EGAN00001085924,,,,Custom,,,[email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected],[email protected] [email protected] [email protected] [email protected] [email protected],[email protected] [email protected] [email protected] [email protected],[email protected],,0,0,6103057,0,PD4845a-RNA_rnaseq 6101639,Human,9606,S0814,1177,CGP Core Sequencing 10%2F12 to 09%2F13,standard,pass,4683991,from:175 to:225,EGAN00001085924,,Homo sapiens,,,,1505636,PD4845a-RNA_rnaseq,PD4845a-RNA,,,168,EGAS00001000377,1,0,0,We propose to definitively characterise the somatic genetics of triple negative breast cancer through generation of comprehensive catalogues of somatic mutations in breast cancer cases by high coverage genome sequencing coupled with integrated transcriptomic and methylation analyses.,2410,Triple Negative Breast Cancer RNA Sequencing,Homo_sapiens (CGP_GRCh37.NCBI.allchr_MT),,Triple Negative Breast Cancer RNA Sequencing,,
3737
8,6101640,EGAN00001085925,,,,Custom2,,,[email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected],[email protected] [email protected] [email protected] [email protected] [email protected],[email protected] [email protected] [email protected] [email protected],[email protected],,0,0,6103058,0,PD4845a-RNA2_rnaseq 6101640,Human,9606,S0814,1177,CGP Core Sequencing 10%2F12 to 09%2F13,standard,pass,4683992,from:175 to:225,EGAN00001085925,,Homo sapiens,,,,1505637,PD4845a-RNA2_rnaseq,PD4845a-RNA2,,,168,EGAS00001000377,1,0,0,We propose to definitively characterise the somatic genetics of triple negative breast cancer through generation of comprehensive catalogues of somatic mutations in breast cancer cases by high coverage genome sequencing coupled with integrated transcriptomic and methylation analyses.,2410,Triple Negative Breast Cancer RNA Sequencing,Homo_sapiens (CGP_GRCh37.NCBI.allchr_MT),,Triple Negative Breast Cancer RNA Sequencing,,

0 commit comments

Comments
 (0)