Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/400388 )
Change subject: Skip unit tests, if diff 3 is not installed
......................................................................
Skip unit tests, if diff 3 is not installed
Will fail when $wgDiff3 is not set correctly
Change-Id: I4b5788433ad87c11a146f57c6a6f1e6b3c96cc01
---
M tests/phpunit/index/IndexContentHandlerTest.php
M tests/phpunit/page/PageContentHandlerTest.php
2 files changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage
refs/changes/88/400388/1
diff --git a/tests/phpunit/index/IndexContentHandlerTest.php
b/tests/phpunit/index/IndexContentHandlerTest.php
index e87467a..55c61bd 100644
--- a/tests/phpunit/index/IndexContentHandlerTest.php
+++ b/tests/phpunit/index/IndexContentHandlerTest.php
@@ -235,6 +235,8 @@
* @dataProvider merge3Provider
*/
public function testMerge3( $oldContent, $myContent, $yourContent,
$expected ) {
+ $this->markTestSkippedIfNoDiff3();
+
$merged = $this->handler->merge3( $oldContent, $myContent,
$yourContent );
$this->assertEquals( $expected, $merged );
diff --git a/tests/phpunit/page/PageContentHandlerTest.php
b/tests/phpunit/page/PageContentHandlerTest.php
index a74e825..1eb52ed 100644
--- a/tests/phpunit/page/PageContentHandlerTest.php
+++ b/tests/phpunit/page/PageContentHandlerTest.php
@@ -309,6 +309,8 @@
* @dataProvider merge3Provider
*/
public function testMerge3( $oldContent, $myContent, $yourContent,
$expected ) {
+ $this->markTestSkippedIfNoDiff3();
+
$merged = $this->handler->merge3( $oldContent, $myContent,
$yourContent );
$this->assertEquals( $expected, $merged );
--
To view, visit https://gerrit.wikimedia.org/r/400388
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4b5788433ad87c11a146f57c6a6f1e6b3c96cc01
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
