dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
b9f1817
..
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',
'name' => 'fsLockManager',
'class' => 'FSLockManager',
'lockDirectory' => wfTempDir() . '/test-repo/lockdir',
+ ), array(
+ 'name' => 'nullLockManager',
+ 'class' => 'NullLockManager',
) );
$wgLocalFileRepo = array(
'class' => 'LocalRepo',
) );
$wgLocalFileRepo = array(
'class' => 'LocalRepo',
@@
-634,11
+637,14
@@
class ParserTest {
'wgScriptPath' => '/',
'wgArticlePath' => '/wiki/$1',
'wgActionPaths' => array(),
'wgScriptPath' => '/',
'wgArticlePath' => '/wiki/$1',
'wgActionPaths' => array(),
- 'wgLockManagers' => array(
+ 'wgLockManagers' => array(
array(
'name' => 'fsLockManager',
'class' => 'FSLockManager',
'lockDirectory' => $this->uploadDir . '/lockdir',
'name' => 'fsLockManager',
'class' => 'FSLockManager',
'lockDirectory' => $this->uploadDir . '/lockdir',
- ),
+ ), array(
+ 'name' => 'nullLockManager',
+ 'class' => 'NullLockManager',
+ ) ),
'wgLocalFileRepo' => array(
'class' => 'LocalRepo',
'name' => 'local',
'wgLocalFileRepo' => array(
'class' => 'LocalRepo',
'name' => 'local',
@@
-692,7
+698,6
@@
class ParserTest {
'wgExternalLinkTarget' => false,
'wgAlwaysUseTidy' => false,
'wgHtml5' => true,
'wgExternalLinkTarget' => false,
'wgAlwaysUseTidy' => false,
'wgHtml5' => true,
- 'wgCleanupPresentationalAttributes' => true,
'wgWellFormedXml' => true,
'wgAllowMicrodataAttributes' => true,
'wgAdaptiveMessageCache' => true,
'wgWellFormedXml' => true,
'wgAllowMicrodataAttributes' => true,
'wgAdaptiveMessageCache' => true,
@@
-967,7
+972,7
@@
class ParserTest {
private function teardownGlobals() {
RepoGroup::destroySingleton();
FileBackendGroup::destroySingleton();
private function teardownGlobals() {
RepoGroup::destroySingleton();
FileBackendGroup::destroySingleton();
- LockManagerGroup::destroySingleton();
+ LockManagerGroup::destroySingleton
s
();
LinkCache::singleton()->clear();
foreach ( $this->savedGlobals as $var => $val ) {
LinkCache::singleton()->clear();
foreach ( $this->savedGlobals as $var => $val ) {