Merge branch '4.0' into 4.1
* 4.0: [Cache] fix Memcached tests
This commit is contained in:
commit
f68e19468d
@ -22,6 +22,7 @@ class MemcachedAdapterTest extends AdapterTestCase
|
||||
);
|
||||
|
||||
protected static $client;
|
||||
protected static $enableVersioning = false;
|
||||
|
||||
public static function setupBeforeClass()
|
||||
{
|
||||
@ -41,7 +42,23 @@ class MemcachedAdapterTest extends AdapterTestCase
|
||||
{
|
||||
$client = $defaultLifetime ? AbstractAdapter::createConnection('memcached://'.getenv('MEMCACHED_HOST')) : self::$client;
|
||||
|
||||
return new MemcachedAdapter($client, str_replace('\\', '.', __CLASS__), $defaultLifetime);
|
||||
$adapter = new MemcachedAdapter($client, str_replace('\\', '.', __CLASS__), $defaultLifetime);
|
||||
|
||||
if (self::$enableVersioning) {
|
||||
$adapter->enableVersioning();
|
||||
}
|
||||
|
||||
return $adapter;
|
||||
}
|
||||
|
||||
public function testClear()
|
||||
{
|
||||
self::$enableVersioning = true;
|
||||
try {
|
||||
parent::testClear();
|
||||
} finally {
|
||||
self::$enableVersioning = false;
|
||||
}
|
||||
}
|
||||
|
||||
public function testOptions()
|
||||
|
@ -23,6 +23,7 @@ class MemcachedCacheTest extends CacheTestCase
|
||||
);
|
||||
|
||||
protected static $client;
|
||||
protected static $enableVersioning = false;
|
||||
|
||||
public static function setupBeforeClass()
|
||||
{
|
||||
@ -42,7 +43,23 @@ class MemcachedCacheTest extends CacheTestCase
|
||||
{
|
||||
$client = $defaultLifetime ? AbstractAdapter::createConnection('memcached://'.getenv('MEMCACHED_HOST'), array('binary_protocol' => false)) : self::$client;
|
||||
|
||||
return new MemcachedCache($client, str_replace('\\', '.', __CLASS__), $defaultLifetime);
|
||||
$adapter = new MemcachedCache($client, str_replace('\\', '.', __CLASS__), $defaultLifetime);
|
||||
|
||||
if (self::$enableVersioning) {
|
||||
$adapter->enableVersioning();
|
||||
}
|
||||
|
||||
return $adapter;
|
||||
}
|
||||
|
||||
public function testClear()
|
||||
{
|
||||
self::$enableVersioning = true;
|
||||
try {
|
||||
parent::testClear();
|
||||
} finally {
|
||||
self::$enableVersioning = false;
|
||||
}
|
||||
}
|
||||
|
||||
public function testCreatePersistentConnectionShouldNotDupServerList()
|
||||
|
@ -20,6 +20,12 @@ class MemcachedCacheTextModeTest extends MemcachedCacheTest
|
||||
{
|
||||
$client = AbstractAdapter::createConnection('memcached://'.getenv('MEMCACHED_HOST'), array('binary_protocol' => false));
|
||||
|
||||
return new MemcachedCache($client, str_replace('\\', '.', __CLASS__), $defaultLifetime);
|
||||
$adapter = new MemcachedCache($client, str_replace('\\', '.', __CLASS__), $defaultLifetime);
|
||||
|
||||
if (self::$enableVersioning) {
|
||||
$adapter->enableVersioning();
|
||||
}
|
||||
|
||||
return $adapter;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user