@@ -, +, @@ --- t/db_dependent/Holds/CancelReserves.t | 7 ++----- t/db_dependent/Holds/WaitingReserves.t | 4 +--- 2 files changed, 3 insertions(+), 8 deletions(-) --- a/t/db_dependent/Holds/CancelReserves.t +++ a/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; --- a/t/db_dependent/Holds/WaitingReserves.t +++ a/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; +$schema->storage->txn_rollback; --