From: Timo Tijhof <krinklemail@gmail.com>
Date: Sun, 6 Dec 2015 18:06:08 +0000 (+0000)
Subject: tests: Remove unused $wgMemc resets
X-Git-Tag: 1.31.0-rc.0~8769^2~1
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=3b35719e74e2d14fddb10ae34db9c6ba0420ad4a;p=lhc%2Fweb%2Fwiklou.git

tests: Remove unused $wgMemc resets

If we really need this we can do it in MediaWikiTestCase, next
to the setting of wgMainCacheType. But from what I can see the
code being tested here already doesn't use the old $wgMemc.

Change-Id: I9e4b2109b2f3c18d8d5551bbadae5711c1d4c0a6
---

diff --git a/tests/phpunit/includes/ExtraParserTest.php b/tests/phpunit/includes/ExtraParserTest.php
index 7b60fb3f74..46ec6bcfeb 100644
--- a/tests/phpunit/includes/ExtraParserTest.php
+++ b/tests/phpunit/includes/ExtraParserTest.php
@@ -21,7 +21,6 @@ class ExtraParserTest extends MediaWikiTestCase {
 			'wgLanguageCode' => 'en',
 			'wgContLang' => $contLang,
 			'wgLang' => Language::factory( 'en' ),
-			'wgMemc' => new EmptyBagOStuff,
 			'wgCleanSignatures' => true,
 		) );
 
diff --git a/tests/phpunit/includes/TemplateParserTest.php b/tests/phpunit/includes/TemplateParserTest.php
index 3b37f4a46a..ddef24aae9 100644
--- a/tests/phpunit/includes/TemplateParserTest.php
+++ b/tests/phpunit/includes/TemplateParserTest.php
@@ -12,7 +12,6 @@ class TemplateParserTest extends MediaWikiTestCase {
 
 		$this->setMwGlobals( array(
 			'wgSecretKey' => 'foo',
-			'wgMemc' => new EmptyBagOStuff(),
 		) );
 
 		$this->templateDir = dirname( __DIR__ ) . '/data/templates/';
diff --git a/tests/phpunit/includes/TitlePermissionTest.php b/tests/phpunit/includes/TitlePermissionTest.php
index 1318d104c1..4dc83507c9 100644
--- a/tests/phpunit/includes/TitlePermissionTest.php
+++ b/tests/phpunit/includes/TitlePermissionTest.php
@@ -31,7 +31,6 @@ class TitlePermissionTest extends MediaWikiLangTestCase {
 		$localOffset = date( 'Z' ) / 60;
 
 		$this->setMwGlobals( array(
-			'wgMemc' => new EmptyBagOStuff,
 			'wgContLang' => $langObj,
 			'wgLanguageCode' => 'en',
 			'wgLang' => $langObj,
diff --git a/tests/phpunit/includes/api/ApiTestCase.php b/tests/phpunit/includes/api/ApiTestCase.php
index 21345ac1ff..01113a6412 100644
--- a/tests/phpunit/includes/api/ApiTestCase.php
+++ b/tests/phpunit/includes/api/ApiTestCase.php
@@ -37,7 +37,6 @@ abstract class ApiTestCase extends MediaWikiLangTestCase {
 		);
 
 		$this->setMwGlobals( array(
-			'wgMemc' => new EmptyBagOStuff(),
 			'wgAuth' => new StubObject( 'wgAuth', 'AuthPlugin' ),
 			'wgRequest' => new FauxRequest( array() ),
 			'wgUser' => self::$users['sysop']->user,
diff --git a/tests/phpunit/includes/jobqueue/JobQueueTest.php b/tests/phpunit/includes/jobqueue/JobQueueTest.php
index 9808a55bd5..3cb1af60d5 100644
--- a/tests/phpunit/includes/jobqueue/JobQueueTest.php
+++ b/tests/phpunit/includes/jobqueue/JobQueueTest.php
@@ -19,8 +19,6 @@ class JobQueueTest extends MediaWikiTestCase {
 		global $wgJobTypeConf;
 		parent::setUp();
 
-		$this->setMwGlobals( 'wgMemc', new HashBagOStuff() );
-
 		if ( $this->getCliArg( 'use-jobqueue' ) ) {
 			$name = $this->getCliArg( 'use-jobqueue' );
 			if ( !isset( $wgJobTypeConf[$name] ) ) {
diff --git a/tests/phpunit/languages/LanguageConverterTest.php b/tests/phpunit/languages/LanguageConverterTest.php
index d4ccca99c0..8fc0beedb6 100644
--- a/tests/phpunit/languages/LanguageConverterTest.php
+++ b/tests/phpunit/languages/LanguageConverterTest.php
@@ -13,7 +13,6 @@ class LanguageConverterTest extends MediaWikiLangTestCase {
 			'wgContLang' => Language::factory( 'tg' ),
 			'wgLanguageCode' => 'tg',
 			'wgDefaultLanguageVariant' => false,
-			'wgMemc' => new EmptyBagOStuff,
 			'wgRequest' => new FauxRequest( array() ),
 			'wgUser' => new User,
 		) );