From 72c6715260e6605be83cced71029ba21be51aba1 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
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

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

Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 6b3a04da6a2f137ad87e0d39e9cc2c5ab7958850)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
---
 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 4dccdd11ab..c3d163de63 100644
--- a/C4/Auth_with_cas.pm
+++ b/C4/Auth_with_cas.pm
@@ -37,7 +37,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 cdeb630858..6e825d63bb 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.39.5