From: Matthew Flaschen <mflaschen@wikimedia.org>
Date: Fri, 8 Feb 2013 18:23:36 +0000 (-0500)
Subject: Add null lock manager to parser tests to support code that uses it by default.
X-Git-Tag: 1.31.0-rc.0~20750
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=8cbd679aac781bdd73038064261736a937645fc1;p=lhc%2Fweb%2Fwiklou.git

Add null lock manager to parser tests to support code that uses it by default.

Change-Id: I938bd1b64a1b1ff241555f157c0ba737d72ee48d
---

diff --git a/tests/parser/parserTest.inc b/tests/parser/parserTest.inc
index db3c84acf8..05a6f15426 100644
--- a/tests/parser/parserTest.inc
+++ b/tests/parser/parserTest.inc
@@ -155,6 +155,9 @@ class ParserTest {
 			'name'          => 'fsLockManager',
 			'class'         => 'FSLockManager',
 			'lockDirectory' => wfTempDir() . '/test-repo/lockdir',
+		), array(
+			'name'          => 'nullLockManager',
+			'class'         => 'NullLockManager',
 		) );
 		$wgLocalFileRepo = array(
 			'class'           => 'LocalRepo',
@@ -634,11 +637,14 @@ class ParserTest {
 			'wgScriptPath' => '/',
 			'wgArticlePath' => '/wiki/$1',
 			'wgActionPaths' => array(),
-			'wgLockManagers' => array(
+			'wgLockManagers' => array( array(
 				'name'          => 'fsLockManager',
 				'class'         => 'FSLockManager',
 				'lockDirectory' => $this->uploadDir . '/lockdir',
-			),
+			), array(
+				'name'          => 'nullLockManager',
+				'class'         => 'NullLockManager',
+			) ),
 			'wgLocalFileRepo' => array(
 				'class' => 'LocalRepo',
 				'name' => 'local',