From 762fdf3e3c2de3a71fcca9b514ad0f0dd9d59fed Mon Sep 17 00:00:00 2001 From: Mark Tompsett Date: Mon, 2 Oct 2017 21:50:01 -0400 Subject: [PATCH] Bug 18897: Skipping t/db_dependend/00-strict elastic search stuffs as needed Test Plan: $ git fetch $ git checkout -b bug_18897 origin/master $ sudo apt-get remove libcatmandu-store-elasticsearch-perl $ prove t/db_dependent/00-strict.t -- nasty failure. $ git bz apply 18897 -- interactive apply just the four patchs $ prove t/db_dependent/00-strict.t -- nicer skip message run the koha qa test tools Signed-off-by: Tomas Cohen Arazi (cherry picked from commit faf651e514a1d2f5fa84df0c64556cc9962afc99) Signed-off-by: Katrin Fischer --- t/db_dependent/00-strict.t | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/t/db_dependent/00-strict.t b/t/db_dependent/00-strict.t index 11e94030bf..cd29260c86 100644 --- a/t/db_dependent/00-strict.t +++ b/t/db_dependent/00-strict.t @@ -2,6 +2,7 @@ use strict; use warnings; +use Module::Load::Conditional qw[can_load check_install requires]; use Test::More; use Test::Strict; use File::Spec; @@ -19,6 +20,24 @@ my @dirs = ( 'acqui', 'admin', 'authorities', 'basket', 'sms', 'suggestion', 'svc', 'tags', 'tools', 'virtualshelves' ); $Test::Strict::TEST_STRICT = 0; -$Test::Strict::TEST_SKIP = [ 'misc/kohalib.pl', 'sms/sms_listen_windows_start.pl', 'misc/plack/koha.psgi' ]; + +my $general_skips = [ 'misc/kohalib.pl', 'sms/sms_listen_windows_start.pl', 'misc/plack/koha.psgi' ]; +my $elastic_search_files = [ 'misc/search_tools/rebuild_elastic_search.pl' ]; +my @skips; +push @skips,@$general_skips; +if ( ! can_load( + modules => { 'Koha::SearchEngine::Elasticsearch::Indexer' => undef, } ) +) { + my $missing_module; + if ( $Module::Load::Conditional::ERROR =~ /Can\'t locate (.*?) / ) { + $missing_module = $1; + } + my $es_dep_msg = "Required module $missing_module is not installed"; + diag $es_dep_msg; + my $skip_what_msg = "Skipping: " . join ',', @$elastic_search_files; + diag $skip_what_msg; + push @skips, @$elastic_search_files; +} +push @$Test::Strict::TEST_SKIP, @skips; all_perl_files_ok(@dirs); -- 2.39.5