From c2bd69e351422e362438b695e912a2222d54a9a2 Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Mon, 5 Nov 2018 08:51:35 +0100 Subject: [PATCH] Lock TTL fix --- tests/src/Core/Cache/ArrayCacheDriverTest.php | 4 ++++ tests/src/Core/Cache/DatabaseCacheDriverTest.php | 4 ++++ tests/src/Core/Cache/MemcacheCacheDriverTest.php | 5 ++++- tests/src/Core/Cache/MemcachedCacheDriverTest.php | 5 ++++- tests/src/Core/Cache/RedisCacheDriverTest.php | 5 ++++- tests/src/Core/Lock/ArrayCacheLockDriverTest.php | 4 ++++ tests/src/Core/Lock/DatabaseLockDriverTest.php | 4 ++++ tests/src/Core/Lock/MemcacheCacheLockDriverTest.php | 2 ++ tests/src/Core/Lock/MemcachedCacheLockDriverTest.php | 2 ++ tests/src/Core/Lock/RedisCacheLockDriverTest.php | 2 ++ tests/src/Core/Lock/SemaphoreLockDriverTest.php | 4 ++++ 11 files changed, 38 insertions(+), 3 deletions(-) diff --git a/tests/src/Core/Cache/ArrayCacheDriverTest.php b/tests/src/Core/Cache/ArrayCacheDriverTest.php index 6863d149ff..62c599d540 100644 --- a/tests/src/Core/Cache/ArrayCacheDriverTest.php +++ b/tests/src/Core/Cache/ArrayCacheDriverTest.php @@ -5,6 +5,10 @@ namespace Friendica\Test\src\Core\Cache; use Friendica\Core\Cache\ArrayCache; +/** + * @runTestsInSeparateProcesses + * @preserveGlobalState disabled + */ class ArrayCacheDriverTest extends MemoryCacheTest { protected function getInstance() diff --git a/tests/src/Core/Cache/DatabaseCacheDriverTest.php b/tests/src/Core/Cache/DatabaseCacheDriverTest.php index 3cc4a72ed1..60eb7b3295 100644 --- a/tests/src/Core/Cache/DatabaseCacheDriverTest.php +++ b/tests/src/Core/Cache/DatabaseCacheDriverTest.php @@ -4,6 +4,10 @@ namespace Friendica\Test\src\Core\Cache; use Friendica\Core\Cache\CacheDriverFactory; +/** + * @runTestsInSeparateProcesses + * @preserveGlobalState disabled + */ class DatabaseCacheDriverTest extends CacheTest { protected function getInstance() diff --git a/tests/src/Core/Cache/MemcacheCacheDriverTest.php b/tests/src/Core/Cache/MemcacheCacheDriverTest.php index db85723af1..6a81cf46a1 100644 --- a/tests/src/Core/Cache/MemcacheCacheDriverTest.php +++ b/tests/src/Core/Cache/MemcacheCacheDriverTest.php @@ -3,7 +3,10 @@ namespace Friendica\Test\src\Core\Cache; - +/** + * @runTestsInSeparateProcesses + * @preserveGlobalState disabled + */ use Friendica\Core\Cache\CacheDriverFactory; /** diff --git a/tests/src/Core/Cache/MemcachedCacheDriverTest.php b/tests/src/Core/Cache/MemcachedCacheDriverTest.php index fba5c4a958..d371f81fb3 100644 --- a/tests/src/Core/Cache/MemcachedCacheDriverTest.php +++ b/tests/src/Core/Cache/MemcachedCacheDriverTest.php @@ -3,7 +3,10 @@ namespace Friendica\Test\src\Core\Cache; - +/** + * @runTestsInSeparateProcesses + * @preserveGlobalState disabled + */ use Friendica\Core\Cache\CacheDriverFactory; /** diff --git a/tests/src/Core/Cache/RedisCacheDriverTest.php b/tests/src/Core/Cache/RedisCacheDriverTest.php index 0ee73945b9..17079f1e06 100644 --- a/tests/src/Core/Cache/RedisCacheDriverTest.php +++ b/tests/src/Core/Cache/RedisCacheDriverTest.php @@ -3,7 +3,10 @@ namespace Friendica\Test\src\Core\Cache; - +/** + * @runTestsInSeparateProcesses + * @preserveGlobalState disabled + */ use Friendica\Core\Cache\CacheDriverFactory; /** diff --git a/tests/src/Core/Lock/ArrayCacheLockDriverTest.php b/tests/src/Core/Lock/ArrayCacheLockDriverTest.php index 671341718b..bfea27253f 100644 --- a/tests/src/Core/Lock/ArrayCacheLockDriverTest.php +++ b/tests/src/Core/Lock/ArrayCacheLockDriverTest.php @@ -6,6 +6,10 @@ namespace Friendica\Test\src\Core\Lock; use Friendica\Core\Cache\ArrayCache; use Friendica\Core\Lock\CacheLockDriver; +/** + * @runTestsInSeparateProcesses + * @preserveGlobalState disabled + */ class ArrayCacheLockDriverTest extends LockTest { protected function getInstance() diff --git a/tests/src/Core/Lock/DatabaseLockDriverTest.php b/tests/src/Core/Lock/DatabaseLockDriverTest.php index 270d200791..e5ca825c99 100644 --- a/tests/src/Core/Lock/DatabaseLockDriverTest.php +++ b/tests/src/Core/Lock/DatabaseLockDriverTest.php @@ -5,6 +5,10 @@ namespace Friendica\Test\src\Core\Lock; use Friendica\Core\Lock\DatabaseLockDriver; use Friendica\Database\DBA; +/** + * @runTestsInSeparateProcesses + * @preserveGlobalState disabled + */ class DatabaseLockDriverTest extends LockTest { protected function getInstance() diff --git a/tests/src/Core/Lock/MemcacheCacheLockDriverTest.php b/tests/src/Core/Lock/MemcacheCacheLockDriverTest.php index ca9b9b4639..c46eb6faa9 100644 --- a/tests/src/Core/Lock/MemcacheCacheLockDriverTest.php +++ b/tests/src/Core/Lock/MemcacheCacheLockDriverTest.php @@ -8,6 +8,8 @@ use Friendica\Core\Lock\CacheLockDriver; /** * @requires extension Memcache + * @runTestsInSeparateProcesses + * @preserveGlobalState disabled */ class MemcacheCacheLockDriverTest extends LockTest { diff --git a/tests/src/Core/Lock/MemcachedCacheLockDriverTest.php b/tests/src/Core/Lock/MemcachedCacheLockDriverTest.php index 71311d5baa..4a508919a5 100644 --- a/tests/src/Core/Lock/MemcachedCacheLockDriverTest.php +++ b/tests/src/Core/Lock/MemcachedCacheLockDriverTest.php @@ -8,6 +8,8 @@ use Friendica\Core\Lock\CacheLockDriver; /** * @requires extension memcached + * @runTestsInSeparateProcesses + * @preserveGlobalState disabled */ class MemcachedCacheLockDriverTest extends LockTest { diff --git a/tests/src/Core/Lock/RedisCacheLockDriverTest.php b/tests/src/Core/Lock/RedisCacheLockDriverTest.php index 43cedb9cbc..e537e50c10 100644 --- a/tests/src/Core/Lock/RedisCacheLockDriverTest.php +++ b/tests/src/Core/Lock/RedisCacheLockDriverTest.php @@ -8,6 +8,8 @@ use Friendica\Core\Lock\CacheLockDriver; /** * @requires extension redis + * @runTestsInSeparateProcesses + * @preserveGlobalState disabled */ class RedisCacheLockDriverTest extends LockTest { diff --git a/tests/src/Core/Lock/SemaphoreLockDriverTest.php b/tests/src/Core/Lock/SemaphoreLockDriverTest.php index 39f0763fb1..422ab3221f 100644 --- a/tests/src/Core/Lock/SemaphoreLockDriverTest.php +++ b/tests/src/Core/Lock/SemaphoreLockDriverTest.php @@ -4,6 +4,10 @@ namespace Friendica\Test\src\Core\Lock; use Friendica\Core\Lock\SemaphoreLockDriver; +/** + * @runTestsInSeparateProcesses + * @preserveGlobalState disabled + */ class SemaphoreLockDriverTest extends LockTest { protected function getInstance()