diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2013-01-18 16:46:04 +0100 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2013-01-18 16:46:04 +0100 |
| commit | 63601400e476c6cf43d985f3e7b9864681695ed4 (patch) | |
| tree | f7846203a952e38aaf66989d0a4702779f549962 /tests/parser/parserTest.inc | |
| parent | 8ff01378c9e0207f9169b81966a51def645b6a51 (diff) | |
Update to MediaWiki 1.20.2
this update includes:
* adjusted Arch Linux skin
* updated FluxBBAuthPlugin
* patch for https://bugzilla.wikimedia.org/show_bug.cgi?id=44024
Diffstat (limited to 'tests/parser/parserTest.inc')
| -rw-r--r-- | tests/parser/parserTest.inc | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/tests/parser/parserTest.inc b/tests/parser/parserTest.inc index 30e451b3..86e1e192 100644 --- a/tests/parser/parserTest.inc +++ b/tests/parser/parserTest.inc @@ -140,7 +140,7 @@ class ParserTest { $wgNamespaceAliases, $wgNamespaceProtection, $wgLocalFileRepo, $parserMemc, $wgThumbnailScriptPath, $wgScriptPath, $wgArticlePath, $wgStyleSheetPath, $wgScript, $wgStylePath, $wgExtensionAssetsPath, - $wgMainCacheType, $wgMessageCacheType, $wgParserCacheType; + $wgMainCacheType, $wgMessageCacheType, $wgParserCacheType, $wgLockManagers; $wgScript = '/index.php'; $wgScriptPath = '/'; @@ -149,6 +149,11 @@ class ParserTest { $wgStylePath = '/skins'; $wgExtensionAssetsPath = '/extensions'; $wgThumbnailScriptPath = false; + $wgLockManagers = array( array( + 'name' => 'fsLockManager', + 'class' => 'FSLockManager', + 'lockDirectory' => wfTempDir() . '/test-repo/lockdir', + ) ); $wgLocalFileRepo = array( 'class' => 'LocalRepo', 'name' => 'local', @@ -627,6 +632,11 @@ class ParserTest { 'wgScriptPath' => '/', 'wgArticlePath' => '/wiki/$1', 'wgActionPaths' => array(), + 'wgLockManagers' => array( + 'name' => 'fsLockManager', + 'class' => 'FSLockManager', + 'lockDirectory' => $this->uploadDir . '/lockdir', + ), 'wgLocalFileRepo' => array( 'class' => 'LocalRepo', 'name' => 'local', @@ -680,7 +690,6 @@ class ParserTest { 'wgExternalLinkTarget' => false, 'wgAlwaysUseTidy' => false, 'wgHtml5' => true, - 'wgCleanupPresentationalAttributes' => true, 'wgWellFormedXml' => true, 'wgAllowMicrodataAttributes' => true, 'wgAdaptiveMessageCache' => true, @@ -700,6 +709,9 @@ class ParserTest { $this->savedGlobals = array(); + /** @since 1.20 */ + wfRunHooks( 'ParserTestGlobals', array( &$settings ) ); + foreach ( $settings as $var => $val ) { if ( array_key_exists( $var, $GLOBALS ) ) { $this->savedGlobals[$var] = $GLOBALS[$var]; @@ -951,6 +963,8 @@ class ParserTest { */ private function teardownGlobals() { RepoGroup::destroySingleton(); + FileBackendGroup::destroySingleton(); + LockManagerGroup::destroySingleton(); LinkCache::singleton()->clear(); foreach ( $this->savedGlobals as $var => $val ) { |