Added an option to expect failures when testing scripts

Ensembl · Oct 6, 2020 · 5333634 · 5333634
1 parent 78917fe
commit 5333634
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 26 deletions.
diff --git a/modules/Bio/EnsEMBL/Hive/Utils/Test.pm b/modules/Bio/EnsEMBL/Hive/Utils/Test.pm
@@ -166,6 +166,8 @@ sub standaloneJob {
   Arg[2]      : String $url. The location of the database to be created
   Arg[3]      : (optional) Arrayref $args. Extra parameters of the pipeline (as on the command-line)
   Arg[4]      : (optional) Arrayref $tweaks. Tweaks to be applied to the database (as with the -tweak command-line option)
+  Arg[5]      : (optional) Hashref $flags. Flags given to the text framework. Currently the only
+                key that is understood is "expect_failure" to reverse the expectation of the test.
   Example     : init_pipeline(
                     'Bio::EnsEMBL::Hive::Examples::LongMult::PipeConfig::LongMultServer_conf',
                     $server_url,
@@ -183,7 +185,7 @@ sub standaloneJob {
 =cut
 
 sub init_pipeline {
-    my ($file_or_module, $url, $options, $tweaks) = @_;
+    my ($file_or_module, $url, $options, $tweaks, $flags) = @_;
 
     $options ||= [];
 
@@ -203,7 +205,7 @@ sub init_pipeline {
     push @args, @$options;
     push @args, map {-tweak => $_} @$tweaks if $tweaks;
 
-    return _test_ehive_script('init_pipeline', undef, \@args);
+    return _test_ehive_script('init_pipeline', undef, \@args, undef, $flags);
 }
 
 
@@ -214,6 +216,8 @@ sub init_pipeline {
   Arg[2]      : String $url. The location of the database
   Arg[3]      : Arrayref $args. Extra arguments given to the script
   Arg[4]      : String $test_name (optional). The name of the test
+  Arg[5]      : (optional) Hashref $flags. Flags given to the text framework. Currently the only
+                key that is understood is "expect_failure" to reverse the expectation of the test.
   Description : Generic method that can run any eHive script and check its return status
   Returntype  : None
   Exceptions  : TAP-style
@@ -223,12 +227,19 @@ sub init_pipeline {
 =cut
 
 sub _test_ehive_script {
-    my ($script_name, $url, $args, $test_name) = @_;
+    my ($script_name, $url, $args, $test_name, $flags) = @_;
     $args ||= [];
+    $flags ||= {};
     my @ext_args = ( defined($url) ? (-url => $url) : (), @$args );
-    $test_name ||= 'Can run '.$script_name.(@ext_args ? ' with the following cmdline options: '.join(' ', @ext_args) : '');
 
-    ok(!system($ENV{'EHIVE_ROOT_DIR'}.'/scripts/'.$script_name.'.pl', @ext_args), $test_name);
+    my $rc = system($ENV{'EHIVE_ROOT_DIR'}.'/scripts/'.$script_name.'.pl', @ext_args);
+    if ($flags->{expect_failure}) {
+        $test_name ||= $script_name.' fails'.(@ext_args ? ' with the command-line options: '.join(' ', @ext_args) : '');
+        ok($rc, $test_name);
+    } else {
+        $test_name ||= 'Can run '.$script_name.(@ext_args ? ' with the command-line options: '.join(' ', @ext_args) : '');
+        is($rc, 0, $test_name);
+    }
 }
 
 
@@ -237,6 +248,8 @@ sub _test_ehive_script {
   Arg[1]      : String $url. The location of the database
   Arg[2]      : Arrayref $args. Extra arguments given to runWorker
   Arg[3]      : String $test_name (optional). The name of the test
+  Arg[4]      : (optional) Hashref $flags. Flags given to the text framework. Currently the only
+                key that is understood is "expect_failure" to reverse the expectation of the test.
   Example     : runWorker($url, [ -can_respecialize => 1 ]);
   Description : Run a worker on the given pipeline in the current process.
                 The worker options have been divided in three groups: the ones affecting its specialization,
@@ -269,6 +282,8 @@ sub runWorker {
   Arg[1]      : String $url. The location of the database
   Arg[2]      : Arrayref $args. Extra arguments given to seed_pipeline
   Arg[3]      : String $test_name (optional). The name of the test
+  Arg[4]      : (optional) Hashref $flags. Flags given to the text framework. Currently the only
+                key that is understood is "expect_failure" to reverse the expectation of the test.
   Example     : $seed_pipeline($url, [$arg1, $arg2], 'Run seed_pipeline with two arguments');
   Description : Very generic function to run seed_pipeline on the given database with the given arguments
   Returntype  : None
@@ -289,6 +304,8 @@ sub seed_pipeline {
   Arg[1]      : String $url. The location of the database
   Arg[2]      : Arrayref $args. Extra arguments given to beekeeper.pl
   Arg[3]      : String $test_name (optional). The name of the test
+  Arg[4]      : (optional) Hashref $flags. Flags given to the text framework. Currently the only
+                key that is understood is "expect_failure" to reverse the expectation of the test.
   Example     : beekeeper($url, [$arg1, $arg2], 'Run beekeeper with two arguments');
   Description : Very generic function to run beekeeper on the given database with the given arguments
   Returntype  : None
@@ -326,6 +343,8 @@ sub tweak_pipeline {
   Arg[1]      : String $url or undef. The location of the database
   Arg[2]      : Arrayref $args. Extra arguments given to generate_graph.pl
   Arg[3]      : String $test_name (optional). The name of the test
+  Arg[4]      : (optional) Hashref $flags. Flags given to the text framework. Currently the only
+                key that is understood is "expect_failure" to reverse the expectation of the test.
   Example     : generate_graph($url, [-output => 'lm_analyses.png'], 'Generate a PNG A-diagram');
   Description : Very generic function to run generate_graph.pl on the given database with the given arguments
   Returntype  : None
@@ -345,6 +364,8 @@ sub generate_graph {
   Arg[1]      : String $url. The location of the database
   Arg[2]      : Arrayref $args. Extra arguments given to visualize_jobs.pl
   Arg[3]      : String $test_name (optional). The name of the test
+  Arg[4]      : (optional) Hashref $flags. Flags given to the text framework. Currently the only
+                key that is understood is "expect_failure" to reverse the expectation of the test.
   Example     : visualize_jobs($url, [-output => 'lm_jobs.png', -accu_values], 'Generate a PNG J-diagram with accu values');
   Description : Very generic function to run visualize_jobs.pl on the given database with the given arguments
   Returntype  : None
@@ -382,6 +403,8 @@ sub peekJob {
   Arg[1]      : String $url. The location of the database
   Arg[2]      : Arrayref $args. Extra arguments given to db_cmd.pl
   Arg[3]      : String $test_name (optional). The name of the test
+  Arg[4]      : (optional) Hashref $flags. Flags given to the text framework. Currently the only
+                key that is understood is "expect_failure" to reverse the expectation of the test.
   Example     : db_cmd($url, [-sql => 'DROP DATABASE'], 'Drop the database');
   Description : Very generic function to run db_cmd.pl on the given database with the given arguments
   Returntype  : None
@@ -401,6 +424,8 @@ sub db_cmd {
   Arg[1]      : String $url. The location of the database
   Arg[2]      : String $sql. The SQL to run on the database
   Arg[3]      : String $test_name (optional). The name of the test
+  Arg[4]      : (optional) Hashref $flags. Flags given to the text framework. Currently the only
+                key that is understood is "expect_failure" to reverse the expectation of the test.
   Example     : run_sql_on_db($url, 'INSERT INTO sweets (name, quantity) VALUES (3, 'Snickers')');
   Description : Execute an SQL command on the given database and test its execution. This expects the
                 command-line client to return a non-zero code in case of a failure.
@@ -412,8 +437,10 @@ sub db_cmd {
 =cut
 
 sub run_sql_on_db {
-    my ($url, $sql, $test_name) = @_;
-    return _test_ehive_script('db_cmd', $url, [-sql => $sql], $test_name // 'Can run '.$sql);
+    my ($url, $sql, $test_name, $flags) = @_;
+    $flags ||= {};
+    $test_name //= $flags->{expect_failure} ? $sql.' fails' : 'Can run '.$sql;
+    return _test_ehive_script('db_cmd', $url, [-sql => $sql], $test_name, $flags);
 }
 
 

diff --git a/t/02.api/create_drop_database.t b/t/02.api/create_drop_database.t
@@ -44,7 +44,7 @@ foreach my $test_url (@$ehive_test_pipeline_urls) {
     if ($dbc->driver eq 'sqlite') {
         run_sql_on_db($test_url, 'DROP DATABASE', "'rm -f' doesn't care about missing files");
     } else {
-        is(system(@{ $dbc->to_cmd(undef, undef, undef, 'DROP DATABASE') }), 256, "Cannot drop a database that doesn't exist");
+        run_sql_on_db($test_url, 'DROP DATABASE', "Can drop a database that exists", {'expect_failure' => 1});
     }
     run_sql_on_db($test_url, 'CREATE DATABASE', 'Can create a database');
     run_sql_on_db($test_url, 'CREATE DATABASE IF NOT EXISTS', 'Further CREATE DATABASE statements are ignored') unless $dbc->driver eq 'pgsql';

diff --git a/t/03.scripts/beekeeper_opts.t b/t/03.scripts/beekeeper_opts.t
@@ -62,14 +62,11 @@ my $pipeline_url = get_test_url_or_die();
     is($found_beekeeper_dash_run, 1, 'A beekeeper with option -run was registered in the beekeeper table');
 
     # Check that -run -job_id with a non-existant job id fails with TASK_FAILED
-    # Not using beekeeper() because we expect the command to *fail*
-    my @bad_job_cmd = ($ENV{'EHIVE_ROOT_DIR'}.'/scripts/beekeeper.pl', -url => $hive_dba->dbc->url, '-run', -job_id => 98765);
-    my $rc;
-    my $bk_stderr = capture_stderr {
-        $rc = system(@bad_job_cmd);
-    };
-    ok($rc, 'beekeeper -run -job_id 98765 exited with a non-zero return code');
-    like($bk_stderr, qr/Could not fetch Job with dbID=98765/, 'beekeeper complained that the job cannot be found');
+    beekeeper($hive_dba->dbc->url,
+        ['-run', -job_id => 98765],
+        'beekeeper complained that the job cannot be found',
+        {'expect_failure' => 1},
+    );
 
     $beekeeper_rows = $beekeeper_nta->fetch_all();
     is(scalar(@$beekeeper_rows), 3, 'After -sync, -run, and -run -job_id, there are exactly three entries in the beekeeper table');
@@ -83,16 +80,12 @@ my $pipeline_url = get_test_url_or_die();
     is($found_beekeeper_bad_job, 1, 'A beekeeper with option -job_id was registered in the beekeeper table');
 
     # Check that -loop -analyses_pattern with a non-matching pattern fails with TASK_FAILED
-    # Not using beekeeper() because we expect the command to *fail*
-    my @bad_pattern_cmd = ($ENV{'EHIVE_ROOT_DIR'}.'/scripts/beekeeper.pl',
-        -url => $hive_dba->dbc->url,
-        -analyses_pattern => 'this_matches_no_analysis',
-        '-loop');
-    $bk_stderr = capture_stderr {
-        $rc = system(@bad_pattern_cmd);
-    };
-    ok($rc, 'beekeeper -loop -analyses_pattern this_matches_no_analysis exited with a non-zero return code');
-    like($bk_stderr, qr/the -analyses_pattern 'this_matches_no_analysis' did not match any Analyses/, 'beekeeper complained that no analysis could be matched');
+    beekeeper(
+        $hive_dba->dbc->url,
+        ['-loop', -analyses_pattern => 'this_matches_no_analysis'],
+        'beekeeper complained that no analysis could be matched',
+        {'expect_failure' => 1},
+    );
 
     $beekeeper_rows = $beekeeper_nta->fetch_all();
     is(scalar(@$beekeeper_rows), 4, 'After 4 beekeeper commands, there are exactly 4 entries in the beekeeper table');