Merge "Correct check whether the e-mail field was filled in Special:Userlogin/signup"

[lhc/web/wiklou.git] / tests / parser / parserTest.inc

diff --git a/tests/parser/parserTest.inc b/tests/parser/parserTest.inc
index db3c84a..05a6f15 100644 (file)
--- 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',