From 4d6f85b7ef98e980ee332b56f56f88a83377e0ce Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Fri, 21 Jun 2019 09:03:27 +0000 Subject: [PATCH] Bug 23177: (QA follow-up) Move rollback to the end Signed-off-by: Marcel de Rooy Signed-off-by: Martin Renvoize (cherry picked from commit 95a303c8f351bdd926136b5e9110ba9957df52f1) Signed-off-by: Fridolin Somers --- t/db_dependent/Circulation.t | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/t/db_dependent/Circulation.t b/t/db_dependent/Circulation.t index bc15512167..173b7d66a9 100755 --- a/t/db_dependent/Circulation.t +++ b/t/db_dependent/Circulation.t @@ -3037,9 +3037,6 @@ subtest 'AddReturn should clear items.onloan for unissued items' => sub { is( $item->onloan, undef, 'AddReturn did clear items.onloan' ); }; -$schema->storage->txn_rollback; -C4::Context->clear_syspref_cache(); -$cache->clear_from_cache('single_holidays'); subtest 'AddRenewal and AddIssuingCharge tests' => sub { @@ -3318,3 +3315,7 @@ subtest 'CanBookBeIssued & RentalFeesCheckoutConfirmation' => sub { is_deeply( $needsconfirmation, { RENTALCHARGE => '3' }, 'Item needs rentalcharge confirmation to be issued, increment' ); $itemtype->rentalcharge_daily('0')->store; }; + +$schema->storage->txn_rollback; +C4::Context->clear_syspref_cache(); +$cache->clear_from_cache('single_holidays'); -- 2.39.2