http://www.mediawiki.org/wiki/Special:Code/MediaWiki/90561
Revision: 90561
Author: demon
Date: 2011-06-22 00:01:15 +0000 (Wed, 22 Jun 2011)
Log Message:
-----------
Provisional revert of r90538. I can't replicate the failures, but CI's been
complaining since this commit
Modified Paths:
--------------
trunk/phase3/tests/phpunit/MediaWikiTestCase.php
trunk/phase3/tests/phpunit/includes/TitlePermissionTest.php
trunk/phase3/tests/phpunit/includes/UploadTest.php
Property Changed:
----------------
trunk/phase3/includes/templates/NoLocalSettings.php
trunk/phase3/tests/phpunit/includes/parser/MediaWikiParserTest.php
Property changes on: trunk/phase3/includes/templates/NoLocalSettings.php
___________________________________________________________________
Deleted: svn:mergeinfo
- /branches/REL1_15/phase3/includes/templates/NoLocalSettings.php:51646
/branches/new-installer/phase3/includes/templates/NoLocalSettings.php:43664-66004
/branches/sqlite/includes/templates/NoLocalSettings.php:58211-58321
/branches/wmf-deployment/includes/templates/NoLocalSettings.php:53381
Modified: trunk/phase3/tests/phpunit/MediaWikiTestCase.php
===================================================================
--- trunk/phase3/tests/phpunit/MediaWikiTestCase.php 2011-06-21 23:56:30 UTC
(rev 90560)
+++ trunk/phase3/tests/phpunit/MediaWikiTestCase.php 2011-06-22 00:01:15 UTC
(rev 90561)
@@ -231,9 +231,5 @@
MediaWikiPHPUnitCommand::$additionalOptions[$offset] = $value;
}
-
- public static function disableInterwikis( $prefix, &$data ) {
- return false;
- }
}
Modified: trunk/phase3/tests/phpunit/includes/TitlePermissionTest.php
===================================================================
--- trunk/phase3/tests/phpunit/includes/TitlePermissionTest.php 2011-06-21
23:56:30 UTC (rev 90560)
+++ trunk/phase3/tests/phpunit/includes/TitlePermissionTest.php 2011-06-22
00:01:15 UTC (rev 90561)
@@ -3,7 +3,7 @@
/**
* @group Database
*/
-class TitlePermissionTest extends MediaWikiLangTestCase {
+class TitlePermissionTest extends MediaWikiTestCase {
protected $title;
protected $user;
protected $anonUser;
@@ -14,7 +14,6 @@
function setUp() {
global $wgLocaltimezone, $wgLocalTZoffset, $wgMemc,
$wgContLang, $wgLang;
- parent::setUp();
if(!$wgMemc) {
$wgMemc = new EmptyBagOStuff;
@@ -51,10 +50,6 @@
}
}
- function tearDown() {
- parent::tearDown();
- }
-
function setUserPerm( $perm ) {
if ( is_array( $perm ) ) {
$this->user->mRights = $perm;
Modified: trunk/phase3/tests/phpunit/includes/UploadTest.php
===================================================================
--- trunk/phase3/tests/phpunit/includes/UploadTest.php 2011-06-21 23:56:30 UTC
(rev 90560)
+++ trunk/phase3/tests/phpunit/includes/UploadTest.php 2011-06-22 00:01:15 UTC
(rev 90561)
@@ -7,18 +7,12 @@
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;
- }
-
/**
* Test various forms of valid and invalid titles that can be supplied.
*/
Property changes on:
trunk/phase3/tests/phpunit/includes/parser/MediaWikiParserTest.php
___________________________________________________________________
Deleted: svn:mergeinfo
-
/branches/REL1_15/phase3/tests/phpunit/includes/parser/MediaWikiParserTest.php:51646
/branches/REL1_17/phase3/tests/phpunit/includes/parser/MediaWikiParserTest.php:81445,81448
/branches/new-installer/phase3/tests/phpunit/includes/parser/MediaWikiParserTest.php:43664-66004
/branches/sqlite/tests/phpunit/includes/parser/MediaWikiParserTest.php:58211-58321
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
