Attachment 88963 Details for Bug 22284 – Bug 22284: (follow-up) Remove commented warn and address test failures

[patch] Bug 22284: (follow-up) Remove commented warn and address test failures

Bug-22284-follow-up-Remove-commented-warn-and-addr.patch (text/plain), 3.87 KB, created by Agustín Moyano on 2019-04-26 19:17:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Agustín Moyano

Created: 2019-04-26 19:17:18 UTC

Size: 3.87 KB

patch

obsolete

>From d44dd596241cc5d227a3037b29c601439f6151bf Mon Sep 17 00:00:00 2001
>From: Agustin Moyano <agustinmoyano@theke.io>
>Date: Tue, 23 Apr 2019 16:18:59 -0300
>Subject: [PATCH] Bug 22284: (follow-up) Remove commented warn and address test
> failures
>
>Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
>---
> Koha/Item.pm              |  2 --
> t/db_dependent/Holds.t    | 10 ++++++++++
> t/db_dependent/Reserves.t | 24 ++++++++++++------------
> 3 files changed, 22 insertions(+), 14 deletions(-)
>
>diff --git a/Koha/Item.pm b/Koha/Item.pm
>index 422c50858d..4f70663a78 100644
>--- a/Koha/Item.pm
>+++ b/Koha/Item.pm
>@@ -302,8 +302,6 @@ sub pickup_locations {
>     my $branch_control = C4::Context->preference('HomeOrHoldingBranch');
>     my $library = $branch_control eq 'holdingbranch' ? $self->holding_branch : $self->home_branch;
> 
>-    #warn $branch_control.' '.$branchitemrule->{holdallowed}.' '.$library->branchcode.' '.$patron->branchcode;
>-
>     my @libs;
>     if(defined $patron) {
>         return @libs if $branchitemrule->{holdallowed} == 3 && !$library->validate_hold_sibling( {branchcode => $patron->branchcode} );
>diff --git a/t/db_dependent/Holds.t b/t/db_dependent/Holds.t
>index 2d17abaf5c..f83a9872db 100755
>--- a/t/db_dependent/Holds.t
>+++ b/t/db_dependent/Holds.t
>@@ -243,7 +243,12 @@ is( $hold->priority, '6', "Test AlterPriority(), move to bottom" );
> my $foreign_biblio = $builder->build_sample_biblio({ itemtype => 'DUMMY' });
> my ($foreign_item_bibnum, $foreign_item_bibitemnum, $foreign_itemnumber)
>   = AddItem({ homebranch => $branch_2, holdingbranch => $branch_2 } , $foreign_biblio->biblionumber);
>+# Cleanup circulation rules
> $dbh->do('DELETE FROM issuingrules');
>+$dbh->do('DELETE FROM branch_item_rules');
>+$dbh->do('DELETE FROM default_branch_item_rules');
>+$dbh->do('DELETE FROM default_branch_circ_rules');
>+$dbh->do('DELETE FROM default_circ_rules');
> $dbh->do(
>     q{INSERT INTO issuingrules (categorycode, branchcode, itemtype, reservesallowed, holds_per_record)
>       VALUES (?, ?, ?, ?, ?)},
>@@ -553,6 +558,11 @@ subtest 'CanItemBeReserved / holds_per_day tests' => sub {
> 
>     Koha::Holds->search->delete;
>     $dbh->do('DELETE FROM issues');
>+    $dbh->do('DELETE FROM issuingrules');
>+    $dbh->do('DELETE FROM branch_item_rules');
>+    $dbh->do('DELETE FROM default_branch_item_rules');
>+    $dbh->do('DELETE FROM default_branch_circ_rules');
>+    $dbh->do('DELETE FROM default_circ_rules');
>     Koha::Items->search->delete;
>     Koha::Biblios->search->delete;
> 
>diff --git a/t/db_dependent/Reserves.t b/t/db_dependent/Reserves.t
>index 27b2701ab6..52c8928119 100755
>--- a/t/db_dependent/Reserves.t
>+++ b/t/db_dependent/Reserves.t
>@@ -55,6 +55,18 @@ my $builder = t::lib::TestBuilder->new;
> 
> my $frameworkcode = q//;
> 
>+# Cleanup circulation rules
>+$dbh->do('DELETE FROM issuingrules');
>+$dbh->do('DELETE FROM branch_item_rules');
>+$dbh->do('DELETE FROM default_branch_item_rules');
>+$dbh->do('DELETE FROM default_branch_circ_rules');
>+$dbh->do('DELETE FROM default_circ_rules');
>+$dbh->do(
>+    q{INSERT INTO issuingrules (categorycode, branchcode, itemtype, reservesallowed)
>+      VALUES (?, ?, ?, ?)},
>+    {},
>+    '*', '*', '*', 25
>+);
> 
> t::lib::Mocks::mock_preference('ReservesNeedReturns', 1);
> 
>@@ -187,18 +199,6 @@ $requesters{$branch_3} = Koha::Patron->new({
> # to request its items, while $branch_2 will allow its items
> # to fill holds from anywhere.
> 
>-$dbh->do('DELETE FROM issuingrules');
>-$dbh->do('DELETE FROM branch_item_rules');
>-$dbh->do('DELETE FROM default_branch_item_rules');
>-$dbh->do('DELETE FROM default_branch_circ_rules');
>-$dbh->do('DELETE FROM default_circ_rules');
>-$dbh->do(
>-    q{INSERT INTO issuingrules (categorycode, branchcode, itemtype, reservesallowed)
>-      VALUES (?, ?, ?, ?)},
>-    {},
>-    '*', '*', '*', 25
>-);
>-
> # CPL allows only its own patrons to request its items
> $dbh->do(
>     q{INSERT INTO default_branch_circ_rules (branchcode, holdallowed, returnbranch)
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 22284: 88138 | 88139 | 88140 | 88141 | 88142 | 88143 | 88144 | 88145 | 88369 | 88561 | 88793 | 88794 | 88795 | 88796 | 88797 | 88798 | 88799 | 88800 | 88801 | 88802 | 88939 | 88940 | 88941 | 88942 | 88943 | 88944 | 88945 | 88946 | 88947 | 88948 | 88949 | 88955 | 88956 | 88957 | 88958 | 88959 | 88960 | 88961 | 88962 | 88963 | 88964 | 88965 | 89060 | 89061 | 89062 | 89063 | 89064 | 89065 | 89066 | 89067 | 89068 | 89069 | 89070 | 89071 | 89072 | 89073 | 89074 | 89075 | 89076 | 89077 | 89078 | 89079 | 89080 | 89081 | 89082 | 89083 | 89084 | 89085 | 89122 | 89123 | 89124 | 89125 | 89126 | 89127 | 89128 | 89129 | 89130 | 89131 | 89132 | 89133 | 89134 | 89135 | 89523 | 89836 | 89837 | 89838 | 89839 | 89840 | 89841 | 89842 | 89843 | 89844 | 89845 | 89846 | 89847 | 89848 | 89849 | 90133 | 90134 | 90197 | 90198 | 90199 | 90200 | 90201 | 90469 | 90525 | 91261 | 91262 | 91263 | 91264 | 91265 | 91266 | 91267 | 91268 | 91269 | 91270 | 91271 | 91272 | 91273 | 91274 | 91275 | 91276 | 91277 | 91278 | 91279 | 91280 | 91282 | 91701 | 91702 | 91703 | 91704 | 91705 | 91706 | 91707 | 91708 | 91709 | 91710 | 91711 | 91712 | 91713 | 91714 | 91715 | 91716 | 91717 | 91718 | 91719 | 91720 | 91721 | 91750 | 91751 | 91752 | 91753 | 91754 | 91755 | 91756 | 91757 | 91758 | 92554 | 92555 | 92556 | 92557 | 92558 | 92559 | 92560 | 92561 | 92562 | 92563 | 92564 | 92565 | 92566 | 92567 | 92568 | 92569 | 92570 | 92571 | 92572 | 92573 | 92574 | 92752 | 92753 | 92754 | 92755 | 92756 | 92757 | 92758 | 92759 | 92760 | 92761 | 92762 | 92763 | 92764 | 92849 | 92850 | 92851 | 92852 | 92853 | 92854 | 92855 | 92856 | 92857 | 92858 | 92859 | 92860 | 92861 | 94483 | 94484 | 94485 | 94486 | 94487 | 94488 | 94489 | 94490 | 94491 | 94492 | 94493 | 94494 | 94495 | 96437 | 96438 | 96439 | 96440 | 96441 | 96442 | 96443 | 96444 | 96445 | 96446 | 96447 | 96448 | 96449 | 96450 | 96544 | 96545 | 96546 | 96547 | 96548 | 96549 | 96550 | 96551 | 96552 | 96553 | 96554 | 96555 | 96556 | 96557 | 96558 | 115202