From: Timo Tijhof <krinklemail@gmail.com>
Date: Tue, 17 Nov 2015 02:01:16 +0000 (+0000)
Subject: phpunit: Omit long xdiff test provider from Jenkins output
X-Git-Tag: 1.31.0-rc.0~8971
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=49bd4ed1e23b42fe7e952e869a7d91f45811040d;p=lhc%2Fweb%2Fwiklou.git

phpunit: Omit long xdiff test provider from Jenkins output

In PHPUnit v4.3 and higher one could call markTestSkipped() from
inside a data provider.

Bug: T43683
Change-Id: Ic5f9f4c715466e3998af76ad98543aeb9c5d396e
---

diff --git a/tests/phpunit/includes/DiffHistoryBlobTest.php b/tests/phpunit/includes/DiffHistoryBlobTest.php
index e28a92cf43..786e05d31c 100644
--- a/tests/phpunit/includes/DiffHistoryBlobTest.php
+++ b/tests/phpunit/includes/DiffHistoryBlobTest.php
@@ -10,7 +10,6 @@ class DiffHistoryBlobTest extends MediaWikiTestCase {
 
 		if ( !function_exists( 'xdiff_string_rabdiff' ) ) {
 			$this->markTestSkipped( 'The version of xdiff extension is lower than 1.5.0' );
-
 			return;
 		}
 	}
@@ -28,7 +27,13 @@ class DiffHistoryBlobTest extends MediaWikiTestCase {
 			"Hash of " . addcslashes( $input, "\0..\37!@\@\177..\377" ) );
 	}
 
-	public static function provideXdiffAdler32() {
+	public function provideXdiffAdler32() {
+		// Hack non-empty early return since PHPUnit expands this provider before running
+		// the setUp() which marks the test as skipped.
+		if ( !function_exists( 'xdiff_string_rabdiff' ) ) {
+			return array( array( '', 'Empty string' ) );
+		}
+
 		return array(
 			array( '', 'Empty string' ),
 			array( "\0", 'Null' ),