From b69beb2499f1f8da4c02a5a593fbeb3221d5ef8b Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Tue, 21 Jul 2015 10:50:17 -0300 Subject: [PATCH] Bug 14167: (QA followup) use warn instead of just STDERR This patch makes Koha::Logger use 'warn' instead of just printing to STDERR. It introduces tests for this warnings too. Signed-off-by: Tomas Cohen Arazi --- Koha/Logger.pm | 6 +++--- t/Logger.t | 35 ++++++++++++++++++++++++++++++++--- 2 files changed, 35 insertions(+), 6 deletions(-) diff --git a/Koha/Logger.pm b/Koha/Logger.pm index 1024cc7cf8..b454100227 100644 --- a/Koha/Logger.pm +++ b/Koha/Logger.pm @@ -87,15 +87,15 @@ sub AUTOLOAD { #do not use log4perl; no print to stderr } elsif ( !$self->_recheck_logfile ) { - print STDERR "Log file not writable for log4perl\n"; - print STDERR "$method: $line\n" if $line; + warn "Log file not writable for log4perl"; + warn "$method: $line" if $line; } elsif ( $self->{logger}->can($method) ) { #use log4perl $self->{logger}->$method($line); return 1; } else { # we should not really get here - print STDERR "ERROR: Unsupported method $method\n"; + warn "ERROR: Unsupported method $method"; } return; } diff --git a/t/Logger.t b/t/Logger.t index a375b20ec1..cef4ea193c 100644 --- a/t/Logger.t +++ b/t/Logger.t @@ -1,3 +1,20 @@ +#!/usr/bin/perl + +# This file is part of Koha. +# +# Koha is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# Koha is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Koha; if not, see . + use Modern::Perl; use C4::Context; @@ -6,13 +23,16 @@ use Koha::Logger; use File::Temp qw/tempfile/; use Test::MockModule; use Test::More tests => 1; +use Test::Warn; subtest 'Test01 -- Simple tests for Koha::Logger' => sub { - plan tests => 6; + plan tests => 8; test01(); }; sub test01 { + + my $ret; my $mContext = new Test::MockModule('C4::Context'); $mContext->mock( 'config', sub { return; } ); @@ -35,9 +55,16 @@ HERE $logger= Koha::Logger->get({ interface => 'intranet' }); is( exists $logger->{logger}, 1, 'Log4perl config found'); is( $logger->warn('Message 2'), 1, 'Message 2 returned a value' ); - is( $logger->catastrophe, undef, 'catastrophe undefined'); + warning_is { $ret = $logger->catastrophe } + "ERROR: Unsupported method catastrophe", + "Undefined method raises warning"; + is( $ret, undef, "'catastrophe' method undefined"); system("chmod 400 $log"); - is( $logger->warn('Message 3'), undef, 'Message 3 returned undef' ); + warnings_are { $ret = $logger->warn('Message 3') } + [ "Log file not writable for log4perl", + "warn: Message 3" ], + "Warnings raised if log file is not writeable"; + is( $ret, undef, 'Message 3 returned undef' ); } sub mytempfile { @@ -46,3 +73,5 @@ sub mytempfile { close $fh; return $fn; } + +1; -- 2.39.5