From 3c57bec275accde0ca403d6e186806efae2fb6df Mon Sep 17 00:00:00 2001
From: aude <aude.wiki@gmail.com>
Date: Sun, 24 Nov 2013 01:20:46 +0100
Subject: [PATCH] Call parent::setUp() in DiffHistoryBlobTest before marking
 skipped tests

Jenkins skips these tests because xdiff is unavailable. The tests get
marked as skipped, out of order and before the error reporting setup.

Things are left in an inconsistent state when running *all* the tests together,
and interferes with later error handling (including PHPUnit_Framework_Error)
in other tests.

The gate-and-submit and other jobs are split into multiple jobs,
and for some reason does not trigger this issue.

This will probably fix bug 57488.

Bug: 57488
Change-Id: Ie1a213e912b5858b43956fc35cf00226636f2093
---
 tests/phpunit/includes/DiffHistoryBlobTest.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/phpunit/includes/DiffHistoryBlobTest.php b/tests/phpunit/includes/DiffHistoryBlobTest.php
index 76a9a10c8f..0b04c6e5ea 100644
--- a/tests/phpunit/includes/DiffHistoryBlobTest.php
+++ b/tests/phpunit/includes/DiffHistoryBlobTest.php
@@ -1,7 +1,10 @@
 <?php
 
 class DiffHistoryBlobTest extends MediaWikiTestCase {
+
 	protected function setUp() {
+		parent::setUp();
+
 		if ( !extension_loaded( 'xdiff' ) ) {
 			$this->markTestSkipped( 'The xdiff extension is not available' );
 
@@ -17,7 +20,6 @@ class DiffHistoryBlobTest extends MediaWikiTestCase {
 
 			return;
 		}
-		parent::setUp();
 	}
 
 	/**
-- 
2.20.1