jenkins-bot has submitted this change and it was merged.
Change subject: Always use php based diff in EchoDiscussionParserTest
......................................................................
Always use php based diff in EchoDiscussionParserTest
The previous check here meant that different
setups could run these tests with current diff
engines thus these tests could result in different
successes / failures.
Change-Id: I62a52dee1dd1ecd2ebd36e1aa540245e90a57ddd
---
M tests/phpunit/DiscussionParserTest.php
1 file changed, 1 insertion(+), 3 deletions(-)
Approvals:
Sbisson: Looks good to me, approved
WMDE-leszek: Looks good to me, but someone else must approve
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/phpunit/DiscussionParserTest.php
b/tests/phpunit/DiscussionParserTest.php
index 1e7e3c0..a213ea3 100644
--- a/tests/phpunit/DiscussionParserTest.php
+++ b/tests/phpunit/DiscussionParserTest.php
@@ -130,9 +130,7 @@
protected function setUp() {
parent::setUp();
- if ( extension_loaded( 'wikidiff2' ) ) {
- $this->setMwGlobals( array( 'wgDiff' => false ) );
- }
+ $this->setMwGlobals( array( 'wgDiff' => false ) );
// users need to be added for each test, resetDB() removes them
// TODO: Only add users needed for each test, instead of adding
them
--
To view, visit https://gerrit.wikimedia.org/r/305642
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I62a52dee1dd1ecd2ebd36e1aa540245e90a57ddd
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Catrope <roan.katt...@gmail.com>
Gerrit-Reviewer: Mattflaschen <mflasc...@wikimedia.org>
Gerrit-Reviewer: Sbisson <sbis...@wikimedia.org>
Gerrit-Reviewer: WMDE-leszek <leszek.mani...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
