X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=tests%2Fsrc%2FCore%2FLock%2FRedisCacheLockTest.php;h=360fa74fb2b1a043d7d25542684d6270e4d22d61;hb=e6c054c27602a3acadac3c423273bdf748fcee27;hp=95f7206e2c79d73367c2f12bd9b8da98c2b54462;hpb=0823f4d72d204f1ea5b22fff0637a8ef5107885b;p=friendica.git diff --git a/tests/src/Core/Lock/RedisCacheLockTest.php b/tests/src/Core/Lock/RedisCacheLockTest.php index 95f7206e2c..360fa74fb2 100644 --- a/tests/src/Core/Lock/RedisCacheLockTest.php +++ b/tests/src/Core/Lock/RedisCacheLockTest.php @@ -1,11 +1,31 @@ . + * + */ namespace Friendica\Test\src\Core\Lock; +use Exception; use Friendica\Core\Cache\RedisCache; -use Friendica\Core\Config\Configuration; +use Friendica\Core\Config\IConfig; use Friendica\Core\Lock\CacheLock; +use Mockery; /** * @requires extension redis @@ -15,9 +35,10 @@ class RedisCacheLockTest extends LockTest { protected function getInstance() { - $configMock = \Mockery::mock(Configuration::class); + $configMock = Mockery::mock(IConfig::class); $host = $_SERVER['REDIS_HOST'] ?? 'localhost'; + $port = $_SERVER['REDIS_PORT'] ?? 6379; $configMock ->shouldReceive('get') @@ -26,12 +47,12 @@ class RedisCacheLockTest extends LockTest $configMock ->shouldReceive('get') ->with('system', 'redis_port') - ->andReturn(null); + ->andReturn($port); $configMock ->shouldReceive('get') ->with('system', 'redis_db', 0) - ->andReturn(3); + ->andReturn(0); $configMock ->shouldReceive('get') ->with('system', 'redis_password') @@ -42,8 +63,8 @@ class RedisCacheLockTest extends LockTest try { $cache = new RedisCache($host, $configMock); $lock = new CacheLock($cache); - } catch (\Exception $e) { - $this->markTestSkipped('Redis is not available'); + } catch (Exception $e) { + static::markTestSkipped('Redis is not available. Error: ' . $e->getMessage()); } return $lock;