From ab00e492cbdbf9c461eb60971ef6105a2a8b82a4 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 16 Nov 2016 07:44:03 +0000 Subject: [PATCH] Bug 17637: Fix tests Auth_with_ldap.t Koha::Patron->delete create a transaction and so we need to use txn_begin to have nested txn DBD::mysql::db begin_work failed: Already in a transaction Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi --- t/db_dependent/Auth_with_ldap.t | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/t/db_dependent/Auth_with_ldap.t b/t/db_dependent/Auth_with_ldap.t index 6e20c69..446982c 100755 --- a/t/db_dependent/Auth_with_ldap.t +++ b/t/db_dependent/Auth_with_ldap.t @@ -27,11 +27,8 @@ use C4::Context; use Koha::Patrons; -my $dbh = C4::Context->dbh; - -# Start transaction -$dbh->{AutoCommit} = 0; -$dbh->{RaiseError} = 1; +my $schema = Koha::Database->new->schema; +$schema->storage->txn_begin; my $builder = t::lib::TestBuilder->new(); @@ -118,6 +115,7 @@ subtest 'checkpw_ldap tests' => sub { plan tests => 4; + my $dbh = C4::Context->dbh; ## Connection fail tests $desired_connection_result = 'error'; warning_is { @@ -508,6 +506,6 @@ sub reload_ldap_module { return; } -$dbh->rollback; +$schema->storage->txn_rollback; 1; -- 2.7.4