X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmes_infos.php?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2FEditPageTest.php;h=90ee1bb8f838eef8cdd7eaac8f2b3f86bb075cd2;hb=5d97e895562ec09d9233e199c21f5af7c6d58c9f;hp=f113b1f72af13a31f6094634af10bd452cfe088a;hpb=84d2a06fc40435e1c0063610c05e91e1b90b03e9;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/EditPageTest.php b/tests/phpunit/includes/EditPageTest.php
index f113b1f72a..90ee1bb8f8 100644
--- a/tests/phpunit/includes/EditPageTest.php
+++ b/tests/phpunit/includes/EditPageTest.php
@@ -542,7 +542,7 @@ hello
 	public function testAutoMerge( $baseUser, $text, $adamsEdit, $bertasEdit,
 		$expectedCode, $expectedText, $message = null
 	) {
-		$this->checkHasDiff3();
+		$this->markTestSkippedIfNoDiff3();
 
 		// create page
 		$ns = $this->getDefaultWikitextNS();