From c793b7eda514e87221111b5d445a2104337e0d38 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Thu, 4 May 2017 14:15:51 +0200 Subject: [PATCH] Bug 12063: [QA Follow-up] Small change of two test scripts Content-Type: text/plain; charset=utf-8 Removing dbh from one script, changing rollback in the other. Schema is leading now. Signed-off-by: Marcel de Rooy --- t/db_dependent/Holds/CancelReserves.t | 7 ++----- t/db_dependent/Holds/WaitingReserves.t | 4 +--- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/t/db_dependent/Holds/CancelReserves.t b/t/db_dependent/Holds/CancelReserves.t index 302b155..6c2a7c2 100644 --- a/t/db_dependent/Holds/CancelReserves.t +++ b/t/db_dependent/Holds/CancelReserves.t @@ -14,11 +14,6 @@ use_ok('C4::Reserves'); my $schema = Koha::Database->new->schema; $schema->storage->txn_begin; - -my $dbh = C4::Context->dbh; -$dbh->{AutoCommit} = 0; -$dbh->{RaiseError} = 1; - my $builder = t::lib::TestBuilder->new(); t::lib::Mocks::mock_preference('ExpireReservesOnHolidays', 0); @@ -99,3 +94,5 @@ t::lib::Mocks::mock_preference('ExpireReservesOnHolidays', 1); CancelExpiredReserves(); $r3 = Koha::Holds->find($reserve3->{reserve_id}); is($r3, undef,'Reserve 3 should be canceled.'); + +$schema->storage->txn_rollback; diff --git a/t/db_dependent/Holds/WaitingReserves.t b/t/db_dependent/Holds/WaitingReserves.t index e9e1814..292061d 100644 --- a/t/db_dependent/Holds/WaitingReserves.t +++ b/t/db_dependent/Holds/WaitingReserves.t @@ -16,8 +16,6 @@ my $schema = Koha::Database->new->schema; $schema->storage->txn_begin; my $dbh = C4::Context->dbh; -$dbh->{AutoCommit} = 0; -$dbh->{RaiseError} = 1; $dbh->do(q{DELETE FROM special_holidays}); $dbh->do(q{DELETE FROM repeatable_holidays}); $dbh->do("DELETE FROM reserves"); @@ -243,4 +241,4 @@ ModReserveAffect( $item4->{itemnumber}, $patron2->{borrowernumber}, 0, $reserve4 my $r4 = Koha::Holds->find($reserve4->{reserve_id}); is($r4->expirationdate, $requested_expiredate->ymd, 'Requested expiration date should be kept' ); -$dbh->rollback; \ No newline at end of file +$schema->storage->txn_rollback; -- 2.1.4