Merge branch 'master' into 2.6

This commit is contained in:
mark_story 2014-10-15 23:28:27 -04:00
commit 4c93f103c7
3 changed files with 62 additions and 17 deletions

View file

@ -349,14 +349,7 @@ class MemcachedEngineTest extends CakeTestCase {
'password' => 'password'
);
$this->skipIf(
method_exists($Memcached->getMemcached(), 'setSaslAuthData'),
'Memcached extension is installed with SASL support'
);
$this->setExpectedException(
'CacheException', 'Memcached extension is not build with SASL support'
);
$this->setExpectedException('PHPUnit_Framework_Error_Warning');
$Memcached->init($settings);
}
@ -707,6 +700,8 @@ class MemcachedEngineTest extends CakeTestCase {
* @return void
*/
public function testLongDurationEqualToZero() {
$this->markTestSkipped('Cannot run as Memcached cannot be reflected');
$memcached = new TestMemcachedEngine();
$memcached->settings['compress'] = false;