diff options
| author | Robin McCorkell <rmccorkell@karoshi.org.uk> | 2015-07-16 03:53:18 +0100 |
|---|---|---|
| committer | Robin McCorkell <rmccorkell@karoshi.org.uk> | 2015-07-16 03:53:18 +0100 |
| commit | 8efa23c895dc5ca6ad3216b26d4178cc9e5e839a (patch) | |
| tree | c47a8547250c13f15e5cd5eae0f0cec772adb77c | |
| parent | e556d97b6472ab32fabf2fbc716b319fbc923ce9 (diff) | |
| download | nextcloud-server-8efa23c895dc5ca6ad3216b26d4178cc9e5e839a.tar.gz nextcloud-server-8efa23c895dc5ca6ad3216b26d4178cc9e5e839a.zip | |
Fix memcache factory unit tests
| -rw-r--r-- | lib/private/memcache/factory.php | 4 | ||||
| -rw-r--r-- | tests/lib/memcache/factory.php | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lib/private/memcache/factory.php b/lib/private/memcache/factory.php index a3fc8dfe62c..fe82558e731 100644 --- a/lib/private/memcache/factory.php +++ b/lib/private/memcache/factory.php @@ -82,7 +82,7 @@ class Factory implements ICacheFactory { $missingCacheMessage = 'Memcache {class} not available for {use} cache'; $missingCacheHint = 'Is the matching PHP module installed and enabled?'; if (!$localCacheClass::isAvailable()) { - if (\OC::$CLI) { + if (\OC::$CLI && !defined('PHPUNIT_RUN')) { // CLI should not hard-fail on broken memcache $this->logger->info($missingCacheMessage, [ 'class' => $localCacheClass, @@ -97,7 +97,7 @@ class Factory implements ICacheFactory { } } if (!$distributedCacheClass::isAvailable()) { - if (\OC::$CLI) { + if (\OC::$CLI && !defined('PHPUNIT_RUN')) { // CLI should not hard-fail on broken memcache $this->logger->info($missingCacheMessage, [ 'class' => $distributedCacheClass, diff --git a/tests/lib/memcache/factory.php b/tests/lib/memcache/factory.php index c25e5937c16..33a27a42113 100644 --- a/tests/lib/memcache/factory.php +++ b/tests/lib/memcache/factory.php @@ -114,7 +114,8 @@ class Test_Factory extends \Test\TestCase { */ public function testCacheAvailability($localCache, $distributedCache, $lockingCache, $expectedLocalCache, $expectedDistributedCache, $expectedLockingCache) { - $factory = new \OC\Memcache\Factory('abc', $localCache, $distributedCache, $lockingCache); + $logger = $this->getMockBuilder('\OCP\ILogger')->getMock(); + $factory = new \OC\Memcache\Factory('abc', $logger, $localCache, $distributedCache, $lockingCache); $this->assertTrue(is_a($factory->createLocal(), $expectedLocalCache)); $this->assertTrue(is_a($factory->createDistributed(), $expectedDistributedCache)); $this->assertTrue(is_a($factory->createLocking(), $expectedLockingCache)); @@ -125,6 +126,7 @@ class Test_Factory extends \Test\TestCase { * @expectedException \OC\HintException */ public function testCacheNotAvailableException($localCache, $distributedCache) { - new \OC\Memcache\Factory('abc', $localCache, $distributedCache); + $logger = $this->getMockBuilder('\OCP\ILogger')->getMock(); + new \OC\Memcache\Factory('abc', $logger, $localCache, $distributedCache); } } |