Attachment 43512 Details for Bug 12803 – Bug 12803 [QA Followup] - Allow holiday caching to be disabled for testing purposes

[patch] Bug 12803 [QA Followup] - Allow holiday caching to be disabled for testing purposes

Bug-12803-QA-Followup---Allow-holiday-caching-to-b.patch (text/plain), 1.65 KB, created by Kyle M Hall (khall) on 2015-10-16 13:59:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2015-10-16 13:59:41 UTC

Size: 1.65 KB

patch

obsolete

>From cb183d242a7b0f655a1e0a8d3389755cb399bab8 Mon Sep 17 00:00:00 2001
>From: Kyle M Hall <kyle@bywatersolutions.com>
>Date: Fri, 16 Oct 2015 09:53:51 -0400
>Subject: [PATCH] Bug 12803 [QA Followup] - Allow holiday caching to be disabled for testing purposes
>
>---
> Koha/Calendar.pm            |    2 +-
> t/db_dependent/HoldsQueue.t |    2 ++
> 2 files changed, 3 insertions(+), 1 deletions(-)
>
>diff --git a/Koha/Calendar.pm b/Koha/Calendar.pm
>index a0b642b..5904dee 100644
>--- a/Koha/Calendar.pm
>+++ b/Koha/Calendar.pm
>@@ -104,7 +104,7 @@ sub single_holidays {
>     #   ...
>     # }
> 
>-    unless ($single_holidays) {
>+    if (!$single_holidays || $ENV{NO_CACHE}) {
>         my $dbh = C4::Context->dbh;
>         $single_holidays = {};
> 
>diff --git a/t/db_dependent/HoldsQueue.t b/t/db_dependent/HoldsQueue.t
>index dc2d7e1..7e0158d 100755
>--- a/t/db_dependent/HoldsQueue.t
>+++ b/t/db_dependent/HoldsQueue.t
>@@ -296,6 +296,7 @@ ok( $holds_queue->[1]->{cardnumber} eq 'CARDNUMBER2', "Holds queue filling 2nd c
> # and make today a holiday for MPL. When we run it again we should only
> # have 1 row in the holds queue
> C4::Context->set_preference('HoldsQueueSkipClosed', 1);
>+$ENV{NO_CACHE} = 1;
> my $today = dt_from_string();
> C4::Calendar->new( branchcode => 'MPL' )->insert_single_holiday(
>     day         => $today->day(),
>@@ -324,6 +325,7 @@ C4::Context->set_preference( 'HoldsQueueSkipClosed', 1 );
> C4::HoldsQueue::CreateQueue();
> $holds_queue = $dbh->selectall_arrayref("SELECT * FROM tmp_holdsqueue", { Slice => {} });
> is( scalar( @$holds_queue ), 2, "Holds not filled with items from closed libraries" );
>+$ENV{NO_CACHE} = 0;
> 
> # Bug 14297
> $borrowernumber = AddMember(%data);
>-- 
>1.7.2.5

Actions: View | Diff | Splinter Review

Attachments on bug 12803: 31057 | 31060 | 31061 | 31062 | 31063 | 31630 | 31631 | 32046 | 32271 | 43509 | 43510 | 43511 | 43512 | 43610 | 43779 | 43833 | 43979 | 45569 | 45570 | 45571 | 45572 | 45573 | 45574 | 45575 | 45576 | 45638 | 45643 | 45644 | 46888 | 46889 | 46890 | 46891 | 46892 | 46893 | 46894 | 46895 | 47246 | 47247 | 48574 | 48575