fixup! ci: fix files external workflow for s3 testing

Author: susnux

.github/workflows/files-external-s3.yml

@@ -92,15 +92,14 @@ jobs:
 
       - name: Wait for S3
         run: |
-          sleep 10
           curl -f -m 1 --retry-connrefused --retry 10 --retry-delay 10 http://localhost:9000/minio/health/ready
 
       - name: PHPUnit
         run: |
           composer run test:files_external -- \
-            apps/files_external/tests/Storage/Amazons3Test.php \
-            apps/files_external/tests/Storage/VersionedAmazonS3Test.php \
+            --group S3 \
             --log-junit junit.xml \
+            apps/files_external/tests/Storage \
             ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}
 
       - name: Upload code coverage
@@ -169,7 +168,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,'hostname' => 'localhost','key' => 'ignored','secret' => 'ignored', 'bucket' => 'bucket', 'port' => 4566, 'use_ssl' => false, 'autocreate' => true, 'use_path_style' => true];" > apps/files_external/tests/config.amazons3.php
+          echo "<?php return ['run' => true, 'localstack' => true, 'hostname' => 'localhost','key' => 'ignored','secret' => 'ignored', 'bucket' => 'bucket', 'port' => 4566, 'use_ssl' => false, 'autocreate' => true, 'use_path_style' => true];" > apps/files_external/tests/config.amazons3.php
 
       - name: PHPUnit
         run: composer run test:files_external -- \

apps/files_external/tests/Storage/Amazons3MultiPartTest.php

@@ -13,6 +13,7 @@
  * Class Amazons3Test
  *
  * @group DB
+ * @group S3
  *
  * @package OCA\Files_External\Tests\Storage
  */
@@ -25,7 +26,7 @@ protected function setUp(): void {
 		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 + [
@@ -47,6 +48,10 @@ public function testStat(): void {
 	}
 
 	public function testHashInFileName(): void {
-		$this->markTestSkipped('Localstack has a bug with hashes in filename');
+		if (isset($this->config['localstack'])) {
+			$this->markTestSkipped('Localstack has a bug with hashes in filename');
+		}
+
+		parent::testHashInFileName();
 	}
 }

apps/files_external/tests/Storage/Amazons3Test.php

@@ -14,6 +14,7 @@
  * Class Amazons3Test
  *
  * @group DB
+ * @group S3
  *
  * @package OCA\Files_External\Tests\Storage
  */

apps/files_external/tests/Storage/VersionedAmazonS3Test.php

@@ -10,6 +10,7 @@
 
 /**
  * @group DB
+ * @group S3
  */
 class VersionedAmazonS3Test extends Amazons3Test {
 	protected function setUp(): void {