test: reenable localstack tests (bug fixed) but disable MinIO versioned copy testbackport/53378/stable30

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>

4 files changed, 14 insertions, 21 deletions

diff --git a/.github/workflows/files-external-s3.yml b/.github/workflows/files-external-s3.yml
index 2c32d158fee..e3043737a7a 100644
--- a/.github/workflows/files-external-s3.yml
+++ b/.github/workflows/files-external-s3.yml
@@ -44,9 +44,9 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: ['8.1', '8.2', '8.3']
+        php-versions: ['8.1', '8.2']
         include:
-          - php-versions: '8.2'
+          - php-versions: '8.3'
             coverage: ${{ github.event_name != 'pull_request' }}
 
     name: php${{ matrix.php-versions }}-s3
@@ -87,7 +87,7 @@ jobs:
           composer install
           ./occ maintenance:install --verbose --database=sqlite --database-name=nextcloud --database-host=127.0.0.1 --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass password
           ./occ app:enable --force files_external
-          echo "<?php return ['run' => true, 'secret' => 'actually-not-secret', 'passwordsalt' => 'actually-not-secret', 'hostname' => 'localhost','key' => '$OBJECT_STORE_KEY','secret' => '$OBJECT_STORE_SECRET', 'bucket' => 'bucket', 'port' => 9000, 'use_ssl' => false, 'autocreate' => true, 'use_path_style' => true];" > apps/files_external/tests/config.amazons3.php
+          echo "<?php return ['run' => true, 'minio' => true, 'secret' => 'actually-not-secret', 'passwordsalt' => 'actually-not-secret', 'hostname' => 'localhost','key' => '$OBJECT_STORE_KEY','secret' => '$OBJECT_STORE_SECRET', 'bucket' => 'bucket', 'port' => 9000, 'use_ssl' => false, 'autocreate' => true, 'use_path_style' => true];" > apps/files_external/tests/config.amazons3.php
 
       - name: Wait for S3
         run: |
@@ -122,7 +122,7 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: ['8.1', '8.2', '8.3']
+        php-versions: ['8.1', '8.2', '8.4']
         include:
           - php-versions: '8.3'
             coverage: true
diff --git a/apps/files_external/tests/Storage/Amazons3MultiPartTest.php b/apps/files_external/tests/Storage/Amazons3MultiPartTest.php
index 7bafd75396e..55b3efe4827 100644
--- a/apps/files_external/tests/Storage/Amazons3MultiPartTest.php
+++ b/apps/files_external/tests/Storage/Amazons3MultiPartTest.php
@@ -45,12 +45,4 @@ class Amazons3MultiPartTest extends \Test\Files\Storage\Storage {
 	public function testStat() {
 		$this->markTestSkipped('S3 doesn\'t update the parents folder mtime');
 	}
-
-	public function testHashInFileName(): void {
-		if (isset($this->config['localstack'])) {
-			$this->markTestSkipped('Localstack has a bug with hashes in filename');
-		}
-
-		parent::testHashInFileName();
-	}
 }
diff --git a/apps/files_external/tests/Storage/Amazons3Test.php b/apps/files_external/tests/Storage/Amazons3Test.php
index f5099885b1f..2b66f3beb6e 100644
--- a/apps/files_external/tests/Storage/Amazons3Test.php
+++ b/apps/files_external/tests/Storage/Amazons3Test.php
@@ -18,7 +18,7 @@ use OCA\Files_External\Lib\Storage\AmazonS3;
  * @package OCA\Files_External\Tests\Storage
  */
 class Amazons3Test extends \Test\Files\Storage\Storage {
-	private $config;
+	protected $config;
 	/** @var AmazonS3 */
 	protected $instance;
 
@@ -26,7 +26,7 @@ class Amazons3Test extends \Test\Files\Storage\Storage {
 		parent::setUp();
 
 		$this->config = include('files_external/tests/config.amazons3.php');
-		if (! is_array($this->config) or ! $this->config['run']) {
+		if (!is_array($this->config) || !$this->config['run']) {
 			$this->markTestSkipped('AmazonS3 backend not configured');
 		}
 		$this->instance = new AmazonS3($this->config);
@@ -43,11 +43,4 @@ class Amazons3Test extends \Test\Files\Storage\Storage {
 	public function testStat() {
 		$this->markTestSkipped('S3 doesn\'t update the parents folder mtime');
 	}
-
-	public function testHashInFileName(): void {
-		if (isset($this->config['localstack'])) {
-			$this->markTestSkipped('Localstack has a bug with hashes in filename');
-		}
-		parent::testHashInFileName();
-	}
 }
diff --git a/apps/files_external/tests/Storage/VersionedAmazonS3Test.php b/apps/files_external/tests/Storage/VersionedAmazonS3Test.php
index 89c601c6528..9d413620292 100644
--- a/apps/files_external/tests/Storage/VersionedAmazonS3Test.php
+++ b/apps/files_external/tests/Storage/VersionedAmazonS3Test.php
@@ -26,4 +26,12 @@ class VersionedAmazonS3Test extends Amazons3Test {
 			$this->markTestSkipped("s3 backend doesn't seem to support versioning");
 		}
 	}
+
+	public function testCopyOverWriteDirectory(): void {
+		if (isset($this->config['minio'])) {
+			$this->markTestSkipped('MinIO has a bug with batch deletion on versioned storages, see https://github.com/minio/minio/issues/21366');
+		}
+
+		parent::testCopyOverWriteDirectory();
+	}
 }