Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/279284
Change subject: parserTest: Make wgWellFormedXml configurable in parser tests
......................................................................
parserTest: Make wgWellFormedXml configurable in parser tests
Change-Id: I9e77fbebc86b2fa731c48523a29d0cca4a809e0e
---
M tests/parser/parserTest.inc
M tests/parser/parserTests.txt
M tests/phpunit/includes/parser/NewParserTest.php
3 files changed, 7 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/84/279284/1
diff --git a/tests/parser/parserTest.inc b/tests/parser/parserTest.inc
index 15f2dcf..c8794b2 100644
--- a/tests/parser/parserTest.inc
+++ b/tests/parser/parserTest.inc
@@ -821,10 +821,6 @@
self::getOptionValue( 'language', $opts, 'en' );
$variant =
self::getOptionValue( 'variant', $opts, false );
- $maxtoclevel =
- self::getOptionValue( 'wgMaxTocLevel', $opts, 999 );
- $linkHolderBatchSize =
- self::getOptionValue( 'wgLinkHolderBatchSize', $opts,
1000 );
$settings = [
'wgServer' => 'http://example.org',
@@ -868,7 +864,7 @@
'wgLang' => null,
'wgContLang' => null,
'wgNamespacesWithSubpages' => [ 0 => isset(
$opts['subpage'] ) ],
- 'wgMaxTocLevel' => $maxtoclevel,
+ 'wgMaxTocLevel' => self::getOptionValue(
'wgMaxTocLevel', $opts, 999 ),
'wgCapitalLinks' => true,
'wgNoFollowLinks' => true,
'wgNoFollowDomainExceptions' => [],
@@ -891,11 +887,11 @@
'wgNamespaceProtection' => [ NS_MEDIAWIKI =>
'editinterface' ],
'wgDefaultExternalStore' => [],
'wgForeignFileRepos' => [],
- 'wgLinkHolderBatchSize' => $linkHolderBatchSize,
+ 'wgLinkHolderBatchSize' => self::getOptionValue(
'wgLinkHolderBatchSize', $opts, 1000 ),
'wgExperimentalHtmlIds' => false,
'wgExternalLinkTarget' => false,
'wgHtml5' => true,
- 'wgWellFormedXml' => true,
+ 'wgWellFormedXml' => self::getOptionValue(
'wgWellFormedXml', $opts, true ),
'wgAdaptiveMessageCache' => true,
'wgDisableLangConversion' => false,
'wgDisableTitleConversion' => false,
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index b22cfd8..fce94b4 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -35,7 +35,7 @@
#
# You can also set the following parser properties via test options:
# wgEnableUploads, wgAllowExternalImages, wgMaxTocLevel,
-# wgLinkHolderBatchSize, wgRawHtml
+# wgLinkHolderBatchSize, wgRawHtml, wgWellFormedXml
#
# For testing purposes, temporary articles can created:
# !!article / NAMESPACE:TITLE / !!text / ARTICLE TEXT / !!endarticle
diff --git a/tests/phpunit/includes/parser/NewParserTest.php
b/tests/phpunit/includes/parser/NewParserTest.php
index b1119a1..5f007b9 100644
--- a/tests/phpunit/includes/parser/NewParserTest.php
+++ b/tests/phpunit/includes/parser/NewParserTest.php
@@ -381,10 +381,6 @@
self::getOptionValue( 'language', $opts, 'en' );
$variant =
self::getOptionValue( 'variant', $opts, false );
- $maxtoclevel =
- self::getOptionValue( 'wgMaxTocLevel', $opts, 999 );
- $linkHolderBatchSize =
- self::getOptionValue( 'wgLinkHolderBatchSize', $opts,
1000 );
$uploadDir = $this->getUploadDir();
if ( $this->getCliArg( 'use-filebackend' ) ) {
@@ -431,12 +427,12 @@
'wgNamespacesWithSubpages' => [ NS_MAIN => isset(
$opts['subpage'] ) ],
'wgAllowExternalImages' => self::getOptionValue(
'wgAllowExternalImages', $opts, true ),
'wgThumbLimits' => [ self::getOptionValue( 'thumbsize',
$opts, 180 ) ],
- 'wgMaxTocLevel' => $maxtoclevel,
+ 'wgMaxTocLevel' => self::getOptionValue(
'wgMaxTocLevel', $opts, 999 ),
'wgUseTeX' => isset( $opts['math'] ) || isset(
$opts['texvc'] ),
- 'wgWellFormedXml' => true,
+ 'wgWellFormedXml' => self::getOptionValue(
'wgWellFormedXml', $opts, true ),
'wgMathDirectory' => $uploadDir . '/math',
'wgDefaultLanguageVariant' => $variant,
- 'wgLinkHolderBatchSize' => $linkHolderBatchSize,
+ 'wgLinkHolderBatchSize' => self::getOptionValue(
'wgLinkHolderBatchSize', $opts, 1000 ),
'wgUseTidy' => isset( $opts['tidy'] ),
];
--
To view, visit https://gerrit.wikimedia.org/r/279284
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9e77fbebc86b2fa731c48523a29d0cca4a809e0e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle <krinklem...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
