Provisional revert of r90538. I can't replicate the failures, but CI's been complaini...

diff --git a/tests/phpunit/MediaWikiTestCase.php b/tests/phpunit/MediaWikiTestCase.php
index 64cb486..a88c357 100644 (file)
--- 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 753709c..2b920f5 100644 (file)
--- 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 c9d6afa..da19c90 100644 (file)
--- 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;
        }
 
        /**