aboutsummaryrefslogtreecommitdiffstats
path: root/tests/phpunit/includes/objectcache
diff options
context:
space:
mode:
authorTimo Tijhof <krinkle@fastmail.com>2023-02-14 21:18:33 +0000
committerTimo Tijhof <krinkle@fastmail.com>2023-02-21 21:31:42 +0000
commitd16eba24df93723a2b78f286b7ea0194be8da56f (patch)
tree06e7293c920f184236b1f0d6f4af7a0d9fbb1a2c /tests/phpunit/includes/objectcache
parentbf342382522dfce37dd86ab99a0b8591dbc523cc (diff)
downloadmediawikicore-d16eba24df93723a2b78f286b7ea0194be8da56f.tar.gz
mediawikicore-d16eba24df93723a2b78f286b7ea0194be8da56f.zip
objectcache: Move main cache to internal "_LocalClusterCache" service
This is preparation for re-using it in the MainWANObjectCache service in a way that preserves proper dependency injection. This is related to a declined task (T243233) which proposed offering it as a non-internal service. It is expected to remain internal, with public callers generally migrated to WANObjectCache or WRStats or in some cases to a (not yet implemented) lock manager service. Bug: T329680 Change-Id: I8af9667529b4896f17a22b66823e7eac859d4229
Diffstat (limited to 'tests/phpunit/includes/objectcache')
-rw-r--r--tests/phpunit/includes/objectcache/ObjectCacheTest.php8
1 files changed, 3 insertions, 5 deletions
diff --git a/tests/phpunit/includes/objectcache/ObjectCacheTest.php b/tests/phpunit/includes/objectcache/ObjectCacheTest.php
index a6477b0ba843..ac3b77f1854f 100644
--- a/tests/phpunit/includes/objectcache/ObjectCacheTest.php
+++ b/tests/phpunit/includes/objectcache/ObjectCacheTest.php
@@ -62,12 +62,11 @@ class ObjectCacheTest extends MediaWikiIntegrationTestCase {
}
public function testNewAnythingNoAccel() {
- $this->setMainCache( CACHE_ACCEL );
-
+ // Mock APC not being installed (T160519, T147161)
$this->setCacheConfig( [
- // Mock APC not being installed (T160519, T147161)
CACHE_ACCEL => [ 'class' => EmptyBagOStuff::class ]
] );
+ $this->setMainCache( CACHE_ACCEL );
$this->assertInstanceOf(
SqlBagOStuff::class,
@@ -77,12 +76,11 @@ class ObjectCacheTest extends MediaWikiIntegrationTestCase {
}
public function testNewAnythingNoAccelNoDb() {
- $this->setMainCache( CACHE_ACCEL );
-
$this->setCacheConfig( [
// Mock APC not being installed (T160519, T147161)
CACHE_ACCEL => [ 'class' => EmptyBagOStuff::class ]
] );
+ $this->setMainCache( CACHE_ACCEL );
$this->getServiceContainer()->disableStorage();