From fdd40afc4221cd723fd61b97eeb836e34051ee2e Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Sun, 11 Sep 2016 20:46:43 -0700 Subject: [PATCH] Avoid "No transaction is active" saveFileDependencies() tests errors Unit tests run in CLI mode without DBO_TRX Change-Id: Icee9cf84cb9e057b329dd3960fcc9b238af478a3 --- includes/resourceloader/ResourceLoaderModule.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/includes/resourceloader/ResourceLoaderModule.php b/includes/resourceloader/ResourceLoaderModule.php index 43cf78bd59..44f7e1265f 100644 --- a/includes/resourceloader/ResourceLoaderModule.php +++ b/includes/resourceloader/ResourceLoaderModule.php @@ -486,9 +486,11 @@ abstract class ResourceLoaderModule implements LoggerAwareInterface { ] ); - $dbw->onTransactionResolution( function () use ( &$scopeLock ) { - ScopedCallback::consume( $scopeLock ); // release after commit - } ); + if ( $dbw->trxLevel() ) { + $dbw->onTransactionResolution( function () use ( &$scopeLock ) { + ScopedCallback::consume( $scopeLock ); // release after commit + } ); + } } } catch ( Exception $e ) { wfDebugLog( 'resourceloader', __METHOD__ . ": failed to update DB: $e" ); -- 2.20.1