From 1059cba10cbd625c2036188e900bc974492e9162 Mon Sep 17 00:00:00 2001
From: Mark Tompsett <mtompset@hotmail.com>
Date: Tue, 31 May 2016 12:01:46 -0400
Subject: [PATCH] Bug 16622: some tests triggered by prove t fail for unset
KOHA_CONF
TEST PLAN
---------
1) unset KOHA_CONF
2) prove t
-- 00-load.t dies miserably
3) prove t/Creators.t
-- fails
4) apply patch
5) prove t
-- noisy, but all tests successful
6) prove -v t/Creators.t
-- 2 skipped tests
7) run koha qa test tools
---
C4/Auth_with_cas.pm | 1 -
t/Creators.t | 19 ++++++++++++-------
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/C4/Auth_with_cas.pm b/C4/Auth_with_cas.pm
index c9174da..d8ea7cf 100644
--- a/C4/Auth_with_cas.pm
+++ b/C4/Auth_with_cas.pm
@@ -36,7 +36,6 @@ BEGIN {
@ISA = qw(Exporter);
@EXPORT = qw(check_api_auth_cas checkpw_cas login_cas logout_cas login_cas_url);
}
-my $context = C4::Context->new() or die 'C4::Context->new failed';
my $defaultcasserver;
my $casservers;
my $yamlauthfile = C4::Context->config('intranetdir') . "/C4/Auth_cas_servers.yaml";
diff --git a/t/Creators.t b/t/Creators.t
index cdeb630..6e825d6 100755
--- a/t/Creators.t
+++ b/t/Creators.t
@@ -68,12 +68,17 @@ foreach my $font ( @$font_types ) {
$y += $pdf_creator->FontSize() * 1.2;
}
-my ($fh, $filename) = tempfile();
-open( $fh, '>', $filename );
-select $fh;
+SKIP: {
+ skip "Skipping because without proper fonts these two tests fail",
+ 2 if ! $ENV{KOHA_CONF};
-ok($pdf_creator->End(), "testing End() works");
+ my ($fh, $filename) = tempfile();
+ open( $fh, '>', $filename );
+ select $fh;
-close($fh);
-ok( -s $filename , "test file $filename created OK" );
-unlink $filename unless $ENV{KEEP_PDF};
+ ok($pdf_creator->End(), "testing End() works");
+
+ close($fh);
+ ok( -s $filename , "test file $filename created OK" );
+ unlink $filename unless $ENV{KEEP_PDF};
+}
--
2.1.4