From 36990e362b2e43e18052b6f89b87574516108cfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come.chilliet@nextcloud.com>
Date: Fri, 20 Jan 2023 15:49:15 +0100
Subject: [PATCH] Add apcu and ffmpeg to have less skipped tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Also exclude test groups which rely on a service

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
---
 .github/workflows/phpunit-32bits.yml  | 12 ++++++++++--
 tests/lib/Memcache/APCuTest.php       |  4 ++++
 tests/lib/Memcache/ArrayCacheTest.php |  3 +++
 tests/lib/Memcache/CasTraitTest.php   |  3 +++
 tests/lib/Memcache/FactoryTest.php    |  3 +++
 tests/lib/Memcache/MemcachedTest.php  |  4 ++++
 tests/lib/Memcache/RedisTest.php      |  4 ++++
 7 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/phpunit-32bits.yml b/.github/workflows/phpunit-32bits.yml
index aa89cfb8bfc5f..763043082c812 100644
--- a/.github/workflows/phpunit-32bits.yml
+++ b/.github/workflows/phpunit-32bits.yml
@@ -24,13 +24,21 @@ jobs:
         with:
           submodules: true
 
+      - name: Install tools
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y ffmpeg imagemagick libmagickcore-6.q16-3-extra
+
       - name: Set up php ${{ matrix.php-versions }}
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-versions }}
-          extensions: ctype, curl, dom, fileinfo, gd, imagick, intl, json, mbstring, oci8, openssl, pdo_sqlite, posix, sqlite, xml, zip, apcu
+          extensions: ctype, curl, dom, fileinfo, gd, imagick, intl, json, mbstring, openssl, pdo_sqlite, posix, sqlite, xml, zip, apcu
           tools: phpunit:9
           coverage: none
+          ini-values:
+            apc.enabled=on,
+            apc.enable_cli=on
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -44,4 +52,4 @@ jobs:
 
       - name: PHPUnit
         working-directory: tests
-        run: phpunit --configuration phpunit-autotest.xml
+        run: phpunit --configuration phpunit-autotest.xml --exclude-group PRIMARY-azure,PRIMARY-s3,PRIMARY-swift,Memcached,Redis
diff --git a/tests/lib/Memcache/APCuTest.php b/tests/lib/Memcache/APCuTest.php
index 50e3984ca3405..3568b8a4622d4 100644
--- a/tests/lib/Memcache/APCuTest.php
+++ b/tests/lib/Memcache/APCuTest.php
@@ -9,6 +9,10 @@
 
 namespace Test\Memcache;
 
+/**
+ * @group Memcache
+ * @group APCu
+ */
 class APCuTest extends Cache {
 	protected function setUp(): void {
 		parent::setUp();
diff --git a/tests/lib/Memcache/ArrayCacheTest.php b/tests/lib/Memcache/ArrayCacheTest.php
index 4e3623d344d07..47a39a82d5d17 100644
--- a/tests/lib/Memcache/ArrayCacheTest.php
+++ b/tests/lib/Memcache/ArrayCacheTest.php
@@ -9,6 +9,9 @@
 
 namespace Test\Memcache;
 
+/**
+ * @group Memcache
+ */
 class ArrayCacheTest extends Cache {
 	protected function setUp(): void {
 		parent::setUp();
diff --git a/tests/lib/Memcache/CasTraitTest.php b/tests/lib/Memcache/CasTraitTest.php
index 619721538868e..f077cf143b3ee 100644
--- a/tests/lib/Memcache/CasTraitTest.php
+++ b/tests/lib/Memcache/CasTraitTest.php
@@ -23,6 +23,9 @@
 
 use Test\TestCase;
 
+/**
+ * @group Memcache
+ */
 class CasTraitTest extends TestCase {
 	/**
 	 * @return \OC\Memcache\CasTrait
diff --git a/tests/lib/Memcache/FactoryTest.php b/tests/lib/Memcache/FactoryTest.php
index f16f70eddc2af..9cdd7058ffac2 100644
--- a/tests/lib/Memcache/FactoryTest.php
+++ b/tests/lib/Memcache/FactoryTest.php
@@ -61,6 +61,9 @@ public static function isAvailable(): bool {
 	}
 }
 
+/**
+ * @group Memcache
+ */
 class FactoryTest extends \Test\TestCase {
 	public const AVAILABLE1 = '\\Test\\Memcache\\Test_Factory_Available_Cache1';
 	public const AVAILABLE2 = '\\Test\\Memcache\\Test_Factory_Available_Cache2';
diff --git a/tests/lib/Memcache/MemcachedTest.php b/tests/lib/Memcache/MemcachedTest.php
index caebf50cd6ba0..24cf0ba7af3ce 100644
--- a/tests/lib/Memcache/MemcachedTest.php
+++ b/tests/lib/Memcache/MemcachedTest.php
@@ -9,6 +9,10 @@
 
 namespace Test\Memcache;
 
+/**
+ * @group Memcache
+ * @group Memcached
+ */
 class MemcachedTest extends Cache {
 	public static function setUpBeforeClass(): void {
 		parent::setUpBeforeClass();
diff --git a/tests/lib/Memcache/RedisTest.php b/tests/lib/Memcache/RedisTest.php
index e7bb9c29d36b8..276dbf3a550cc 100644
--- a/tests/lib/Memcache/RedisTest.php
+++ b/tests/lib/Memcache/RedisTest.php
@@ -9,6 +9,10 @@
 
 namespace Test\Memcache;
 
+/**
+ * @group Memcache
+ * @group Redis
+ */
 class RedisTest extends Cache {
 	public static function setUpBeforeClass(): void {
 		parent::setUpBeforeClass();