From: Chad Horohoe <demon@users.mediawiki.org>
Date: Wed, 22 Jun 2011 00:01:15 +0000 (+0000)
Subject: Provisional revert of r90538. I can't replicate the failures, but CI's been complaini... 
X-Git-Tag: 1.31.0-rc.0~29369
X-Git-Url: http://git.cyclocoop.org/%22.%20generer_url_ecrire%28%22sites_tous%22%2C%22%22%29.%20%22?a=commitdiff_plain;h=65e2d85048dab7a2b3c733df244f98201590aa18;p=lhc%2Fweb%2Fwiklou.git

Provisional revert of r90538. I can't replicate the failures, but CI's been complaining since this commit
---

diff --git a/tests/phpunit/MediaWikiTestCase.php b/tests/phpunit/MediaWikiTestCase.php
index 64cb486b5d..a88c3572cf 100644
--- a/tests/phpunit/MediaWikiTestCase.php
+++ b/tests/phpunit/MediaWikiTestCase.php
@@ -231,9 +231,5 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
 		MediaWikiPHPUnitCommand::$additionalOptions[$offset] = $value;
 
 	}
-
-	public static function disableInterwikis( $prefix, &$data ) {
-		return false;
-	}
 }
 
diff --git a/tests/phpunit/includes/TitlePermissionTest.php b/tests/phpunit/includes/TitlePermissionTest.php
index 753709c5da..2b920f5e00 100644
--- a/tests/phpunit/includes/TitlePermissionTest.php
+++ b/tests/phpunit/includes/TitlePermissionTest.php
@@ -3,7 +3,7 @@
 /**
  * @group Database
  */
-class TitlePermissionTest extends MediaWikiLangTestCase {
+class TitlePermissionTest extends MediaWikiTestCase {
 	protected $title;
 	protected $user;
 	protected $anonUser;
@@ -14,7 +14,6 @@ class TitlePermissionTest extends MediaWikiLangTestCase {
 
 	function setUp() {
 		global $wgLocaltimezone, $wgLocalTZoffset, $wgMemc, $wgContLang, $wgLang;
-		parent::setUp();
 
 		if(!$wgMemc) {
 			$wgMemc = new EmptyBagOStuff;
@@ -51,10 +50,6 @@ class TitlePermissionTest extends MediaWikiLangTestCase {
 		}
 	}
 
-	function tearDown() {
-		parent::tearDown();
-	}
-
 	function setUserPerm( $perm ) {
 		if ( is_array( $perm ) ) {
 			$this->user->mRights = $perm;
diff --git a/tests/phpunit/includes/UploadTest.php b/tests/phpunit/includes/UploadTest.php
index c9d6afaf6f..da19c90dbf 100644
--- a/tests/phpunit/includes/UploadTest.php
+++ b/tests/phpunit/includes/UploadTest.php
@@ -7,16 +7,10 @@ class UploadTest extends MediaWikiTestCase {
 
 
 	function setUp() {
-		global $wgHooks;
+		global $wgContLang;
 		parent::setUp();
-
+		$wgContLang = Language::factory( 'en' );
 		$this->upload = new UploadTestHandler;
-		$this->hooks = $wgHooks;
-		$wgHooks['InterwikiLoadPrefix'][] = 'MediaWikiTestCase::disableInterwikis';
-	}
-
-	function tearDown() {
-		$wgHooks = $this->hooks;
 	}
 
 	/**