X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;ds=sidebyside;f=tests%2Fparser%2FparserTest.inc;h=05a6f154260779fc1e58445634f7310af3373535;hb=82f2fcfb125a091cf97ead05bb0e7c485c559ec5;hp=b9f1817ac6fc46599713f32fec421ce09afbb336;hpb=039d830d851df401bda36df616fd1e99cef52c53;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/parser/parserTest.inc b/tests/parser/parserTest.inc
index b9f1817ac6..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',
@@ -692,7 +698,6 @@ class ParserTest {
 			'wgExternalLinkTarget' => false,
 			'wgAlwaysUseTidy' => false,
 			'wgHtml5' => true,
-			'wgCleanupPresentationalAttributes' => true,
 			'wgWellFormedXml' => true,
 			'wgAllowMicrodataAttributes' => true,
 			'wgAdaptiveMessageCache' => true,
@@ -967,7 +972,7 @@ class ParserTest {
 	private function teardownGlobals() {
 		RepoGroup::destroySingleton();
 		FileBackendGroup::destroySingleton();
-		LockManagerGroup::destroySingleton();
+		LockManagerGroup::destroySingletons();
 		LinkCache::singleton()->clear();
 
 		foreach ( $this->savedGlobals as $var => $val ) {