From 4b4f0a18c9591e935b3f973c270dd7b798d166f7 Mon Sep 17 00:00:00 2001 From: Mark Tompsett Date: Fri, 5 Jun 2015 01:01:53 -0400 Subject: [PATCH] Bug 14334: t/db_dependent/Borrower_Discharge.t AutoCommit fix There is no easy way to trigger an obvious problem. TEST PLAN --------- 1) apply patch 2) git diff origin/master -- Are the additions/subtractions similar to http://paste.lisp.org/display/149194? 3) run koha qa test tools NOTE: I am uncertain of what yohann.dufour@biblibre.com means in his FIXME comments. No problems experienced under Debian Jessie. --- t/db_dependent/Borrower_Discharge.t | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/t/db_dependent/Borrower_Discharge.t b/t/db_dependent/Borrower_Discharge.t index b585db2..c17f0f4 100644 --- a/t/db_dependent/Borrower_Discharge.t +++ b/t/db_dependent/Borrower_Discharge.t @@ -12,9 +12,12 @@ use C4::Items qw( AddItem ); use C4::Members qw( AddMember GetMember ); use Koha::Borrower::Discharge; +use Koha::Database; my $dbh = C4::Context->dbh; -$dbh->{AutoCommit} = 0; +my $database = Koha::Database->new(); +my $schema = $database->schema(); +$schema->storage->txn_begin(); $dbh->{RaiseError} = 1; $dbh->do(q|DELETE FROM discharges|); @@ -71,6 +74,7 @@ else { # Even if we switch off this flag, the connection will be blocked. # The error is: # DBIx::Class::ResultSet::create(): DBI Exception: DBD::mysql::st execute failed: Lock wait timeout exceeded; try restarting transaction [for Statement "INSERT INTO discharges ( borrower, needed, validated) VALUES ( ?, ?, ? )" with ParamValues: 0='121', 1='2014-01-08T16:38:29', 2=undef] at /home/koha/src/Koha/DataObject/Discharge.pm line 33 -#is( Koha::Service::Borrower::Discharge::request({ borrowernumber => $borrowernumber }), 1, 'Discharge request sent' ); +isnt( Koha::Borrower::Discharge::request({ borrowernumber => $borrowernumber }), undef, 'Discharge request sent' ); +$schema->storage->txn_rollback(); done_testing; -- 2.1.4