From daa903ac5c5d317754b4d0df1212d18a24337d7b Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Fri, 21 Jun 2019 09:15:18 +0000 Subject: [PATCH] Bug 23177: (QA follow-up) Remove subtest txn_begin and rollback This resolves: DBIx::Class::Storage::txn_rollback(): A txn_rollback in nested transaction is ineffective! (depth 1) Removing unneeded subtest txn's. We should probably add them everywhere or just at global level. Test plan: With all three patches applied, run Circulation.t a few times. Signed-off-by: Marcel de Rooy Signed-off-by: Martin Renvoize --- t/db_dependent/Circulation.t | 4 ---- 1 file changed, 4 deletions(-) diff --git a/t/db_dependent/Circulation.t b/t/db_dependent/Circulation.t index 173b7d66a9..6219ada92c 100755 --- a/t/db_dependent/Circulation.t +++ b/t/db_dependent/Circulation.t @@ -3042,7 +3042,6 @@ subtest 'AddRenewal and AddIssuingCharge tests' => sub { plan tests => 13; - $schema->storage->txn_begin; t::lib::Mocks::mock_preference('item-level_itypes', 1); @@ -3129,14 +3128,12 @@ subtest 'AddRenewal and AddIssuingCharge tests' => sub { is( $line->branchcode, $library->id, 'AddRenewal correctly sets branchcode' ); is( $line->description, "Renewal of Rental Item $title $barcode", 'AddRenewal set a hardcoded description for the accountline' ); - $schema->storage->txn_rollback; }; subtest 'ProcessOfflinePayment() tests' => sub { plan tests => 4; - $schema->storage->txn_begin; my $amount = 123; @@ -3153,7 +3150,6 @@ subtest 'ProcessOfflinePayment() tests' => sub { is( $line->amount+0, $amount * -1, 'amount picked from params' ); is( $line->branchcode, $library->id, 'branchcode set correctly' ); - $schema->storage->txn_rollback; }; subtest 'Incremented fee tests' => sub { -- 2.20.1