added a couple of fan-level collisions to the test, for more fun

Ensembl · Dec 6, 2016 · 83aad9c · 83aad9c
1 parent 55f2e40
commit 83aad9c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/modules/Bio/EnsEMBL/Hive/Examples/Factories/PipeConfig/LeachingTest_conf.pm b/modules/Bio/EnsEMBL/Hive/Examples/Factories/PipeConfig/LeachingTest_conf.pm
@@ -62,7 +62,7 @@ sub pipeline_analyses {
                 {},
             ],
             -flow_into => {
-                1 => { 'factory' => [ {'inputlist' => [ 11, 33, 55, 77 ]}, {'inputlist' => [22, 44, 66 ]} ] },
+                1 => { 'factory' => [ {'inputlist' => [ 11, 33, 55, 66, 77 ]}, {'inputlist' => [22, 44, 55, 66 ]} ] },
             },
         },
 

diff --git a/t/10.pipeconfig/leeching.t b/t/10.pipeconfig/leeching.t
@@ -52,10 +52,14 @@ my @funnel_jobs     = @{ $job_adaptor->fetch_all_by_analysis_id( $funnel_analysi
 
 is(scalar(@funnel_jobs), 1, 'There has to be only one funnel job');
 
-my $funnel_job      = shift @funnel_jobs;
 my $fan_job_count   = $job_adaptor->count_all_by_analysis_id( $fan_analysis->dbID );
+my $correct_count   = 7;
+
+is($fan_job_count, $correct_count, "The number of fan jobs is correct ($fan_job_count == $correct_count)");
+
+my $funnel_job      = shift @funnel_jobs;
 
-is($funnel_job->semaphore_count, $fan_job_count, 'All the fan jobs ('.$fan_job_count.') share the same funnel');
+is($funnel_job->semaphore_count, $fan_job_count, 'All the fan jobs share the same funnel');
 
 $hive_dba->dbc->disconnect_if_idle();
 system( @{ $hive_dba->dbc->to_cmd(undef, undef, undef, 'DROP DATABASE') } );