Add group for cache tests

diff --git a/autotest.sh b/autotest.sh
index 796572d809217bcabc4385127d9474888f88f009..b160950275ef93f0229d8f14e600367d21f6b821 100755 (executable)
--- a/autotest.sh
+++ b/autotest.sh
@@ -134,13 +134,31 @@ function execute_tests {
       echo "No coverage"
     fi
 
+    # per default, there is no cache installed
+    GROUP='--exclude-group=REDIS,MEMCACHE,MEMCACHED,APCU'
+    if [ "$TEST_SELECTION" == "REDIS" ]; then
+      GROUP="--group REDIS"
+    fi
+    if [ "$TEST_SELECTION" == "MEMCACHE" ]; then
+      GROUP="--group MEMCACHE"
+    fi
+    if [ "$TEST_SELECTION" == "MEMCACHED" ]; then
+      GROUP="--group MEMCACHED"
+    fi
+    if [ "$TEST_SELECTION" == "APCU" ]; then
+      GROUP="--group APCU"
+    fi
+    if [ "$TEST_SELECTION" == "NODB" ]; then
+      GROUP="--exclude-group=DB,SLOWDB"
+    fi
+
     INPUT="$BASEDIR/tests"
     if [ -n "$1" ]; then
       INPUT="$INPUT/$1"
     fi
 
-    echo "${PHPUNIT[@]}" --configuration tests/phpunit.xml $COVER --log-junit "autotest-results.xml" "$INPUT" "$2"
-    "${PHPUNIT[@]}" --configuration tests/phpunit.xml $COVER --log-junit "autotest-results.xml" "$INPUT" "$2"
+    echo "${PHPUNIT[@]}" --configuration tests/phpunit.xml "$GROUP" "$COVER" --log-junit "autotest-results.xml" "$INPUT" "$2"
+    "${PHPUNIT[@]}" --configuration tests/phpunit.xml "$GROUP" "$COVER" --log-junit "autotest-results.xml" "$INPUT" "$2"
     RESULT=$?
 
     if [ -n "$DOCKER_CONTAINER_ID" ]; then

diff --git a/tests/src/Core/Cache/APCuCacheTest.php b/tests/src/Core/Cache/APCuCacheTest.php
index 1b90be574ec2167b7d403ea12dbebcfcbb6cb892..dfb81d9c6ce57a5707a8614cb2002f42b1df78f9 100644 (file)
--- a/tests/src/Core/Cache/APCuCacheTest.php
+++ b/tests/src/Core/Cache/APCuCacheTest.php
@@ -4,6 +4,9 @@ namespace Friendica\Test\src\Core\Cache;
 
 use Friendica\Core\Cache\APCuCache;
 
+/**
+ * @group APCU
+ */
 class APCuCacheTest extends MemoryCacheTest
 {
        protected function setUp()

diff --git a/tests/src/Core/Cache/MemcacheCacheTest.php b/tests/src/Core/Cache/MemcacheCacheTest.php
index 8abf169aeafea018f45a9f606b61dcae4676627f..4e3a80619107844ff88f57015fe61d003ce8c507 100644 (file)
--- a/tests/src/Core/Cache/MemcacheCacheTest.php
+++ b/tests/src/Core/Cache/MemcacheCacheTest.php
@@ -7,6 +7,7 @@ use Friendica\Core\Config\Configuration;
 
 /**
  * @requires extension memcache
+ * @group MEMCACHE
  */
 class MemcacheCacheTest extends MemoryCacheTest
 {

diff --git a/tests/src/Core/Cache/MemcachedCacheTest.php b/tests/src/Core/Cache/MemcachedCacheTest.php
index c8c65c9caa0145d64c000b93ed1fe43018a24136..058a784da79215a38a896326bf16d0228cf96690 100644 (file)
--- a/tests/src/Core/Cache/MemcachedCacheTest.php
+++ b/tests/src/Core/Cache/MemcachedCacheTest.php
@@ -9,6 +9,7 @@ use Psr\Log\NullLogger;
 
 /**
  * @requires extension memcached
+ * @group MEMCACHED
  */
 class MemcachedCacheTest extends MemoryCacheTest
 {

diff --git a/tests/src/Core/Cache/RedisCacheTest.php b/tests/src/Core/Cache/RedisCacheTest.php
index cddefe3acc47de3e7464e9b40b85482854c84ab3..75891cd1b8f1d7514694d48b5fd0147d92292cde 100644 (file)
--- a/tests/src/Core/Cache/RedisCacheTest.php
+++ b/tests/src/Core/Cache/RedisCacheTest.php
@@ -8,6 +8,7 @@ use Friendica\Core\Config\Configuration;
 
 /**
  * @requires extension redis
+ * @group REDIS
  */
 class RedisCacheTest extends MemoryCacheTest
 {

diff --git a/tests/src/Core/Lock/APCuCacheLockTest.php b/tests/src/Core/Lock/APCuCacheLockTest.php
index 3fbb3605a195eac0c2e2ea86a72cc03678ab9a56..c2437178108ff0cae6ea8b4a271b9486d6c6013b 100644 (file)
--- a/tests/src/Core/Lock/APCuCacheLockTest.php
+++ b/tests/src/Core/Lock/APCuCacheLockTest.php
@@ -5,6 +5,9 @@ namespace Friendica\Test\src\Core\Lock;
 use Friendica\Core\Cache\APCuCache;
 use Friendica\Core\Lock\CacheLock;
 
+/**
+ * @group APCU
+ */
 class APCuCacheLockTest extends LockTest
 {
        protected function setUp()

diff --git a/tests/src/Core/Lock/MemcacheCacheLockTest.php b/tests/src/Core/Lock/MemcacheCacheLockTest.php
index 4e7dd30340f7acbca7d983657fb5ac4ea6fd9567..cebe246c1926cbec4014acbebefbc7e3dd73f871 100644 (file)
--- a/tests/src/Core/Lock/MemcacheCacheLockTest.php
+++ b/tests/src/Core/Lock/MemcacheCacheLockTest.php
@@ -9,6 +9,7 @@ use Friendica\Core\Lock\CacheLock;
 
 /**
  * @requires extension Memcache
+ * @group MEMCACHE
  */
 class MemcacheCacheLockTest extends LockTest
 {

diff --git a/tests/src/Core/Lock/MemcachedCacheLockTest.php b/tests/src/Core/Lock/MemcachedCacheLockTest.php
index 2249b88b8c9cc43b568ea899edf2a8369f38420a..85387239b73a0c6a78884347a8b826b8471d1165 100644 (file)
--- a/tests/src/Core/Lock/MemcachedCacheLockTest.php
+++ b/tests/src/Core/Lock/MemcachedCacheLockTest.php
@@ -10,6 +10,7 @@ use Psr\Log\NullLogger;
 
 /**
  * @requires extension memcached
+ * @group MEMCACHED
  */
 class MemcachedCacheLockTest extends LockTest
 {

diff --git a/tests/src/Core/Lock/RedisCacheLockTest.php b/tests/src/Core/Lock/RedisCacheLockTest.php
index 5cecd8f4c1aa33893efc1ae1a495eab041f0b44b..95f7206e2c79d73367c2f12bd9b8da98c2b54462 100644 (file)
--- a/tests/src/Core/Lock/RedisCacheLockTest.php
+++ b/tests/src/Core/Lock/RedisCacheLockTest.php
@@ -9,6 +9,7 @@ use Friendica\Core\Lock\CacheLock;
 
 /**
  * @requires extension redis
+ * @group REDIS
  */
 class RedisCacheLockTest extends LockTest
 {