Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/257200
Change subject: tests: Remove unused $wgMemc resets
......................................................................
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
---
M tests/phpunit/includes/ExtraParserTest.php
M tests/phpunit/includes/TemplateParserTest.php
M tests/phpunit/includes/TitlePermissionTest.php
M tests/phpunit/includes/api/ApiTestCase.php
M tests/phpunit/includes/jobqueue/JobQueueTest.php
M tests/phpunit/languages/LanguageConverterTest.php
6 files changed, 0 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/00/257200/1
diff --git a/tests/phpunit/includes/ExtraParserTest.php
b/tests/phpunit/includes/ExtraParserTest.php
index 7b60fb3..46ec6bc 100644
--- a/tests/phpunit/includes/ExtraParserTest.php
+++ b/tests/phpunit/includes/ExtraParserTest.php
@@ -21,7 +21,6 @@
'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 3b37f4a..ddef24a 100644
--- a/tests/phpunit/includes/TemplateParserTest.php
+++ b/tests/phpunit/includes/TemplateParserTest.php
@@ -12,7 +12,6 @@
$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 1318d10..4dc8350 100644
--- a/tests/phpunit/includes/TitlePermissionTest.php
+++ b/tests/phpunit/includes/TitlePermissionTest.php
@@ -31,7 +31,6 @@
$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 21345ac..01113a6 100644
--- a/tests/phpunit/includes/api/ApiTestCase.php
+++ b/tests/phpunit/includes/api/ApiTestCase.php
@@ -37,7 +37,6 @@
);
$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 9808a55..3cb1af6 100644
--- a/tests/phpunit/includes/jobqueue/JobQueueTest.php
+++ b/tests/phpunit/includes/jobqueue/JobQueueTest.php
@@ -19,8 +19,6 @@
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 d4ccca9..8fc0bee 100644
--- a/tests/phpunit/languages/LanguageConverterTest.php
+++ b/tests/phpunit/languages/LanguageConverterTest.php
@@ -13,7 +13,6 @@
'wgContLang' => Language::factory( 'tg' ),
'wgLanguageCode' => 'tg',
'wgDefaultLanguageVariant' => false,
- 'wgMemc' => new EmptyBagOStuff,
'wgRequest' => new FauxRequest( array() ),
'wgUser' => new User,
) );
--
To view, visit https://gerrit.wikimedia.org/r/257200
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9e4b2109b2f3c18d8d5551bbadae5711c1d4c0a6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle <krinklem...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
