diff --git a/.github/workflows/files-external-s3.yml b/.github/workflows/files-external-s3.yml index ddd309f581d..6a0690a9c28 100644 --- a/.github/workflows/files-external-s3.yml +++ b/.github/workflows/files-external-s3.yml @@ -134,7 +134,7 @@ jobs: env: SERVICES: s3 DEBUG: 1 - image: localstack/localstack@sha256:b52c16663c70b7234f217cb993a339b46686e30a1a5d9279cb5feeb2202f837c # v4.4.0 + image: localstack/localstack@sha256:9d4253786e0effe974d77fe3c390358391a56090a4fff83b4600d8a64404d95d # v4.5.0 ports: - "4566:4566" @@ -161,7 +161,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 " 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 " 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: | diff --git a/apps/files_external/tests/Storage/Amazons3MultiPartTest.php b/apps/files_external/tests/Storage/Amazons3MultiPartTest.php index 5bb2ad6da3e..99acc5b4e94 100644 --- a/apps/files_external/tests/Storage/Amazons3MultiPartTest.php +++ b/apps/files_external/tests/Storage/Amazons3MultiPartTest.php @@ -46,6 +46,10 @@ class Amazons3MultiPartTest extends \Test\Files\Storage\Storage { } 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(); } } diff --git a/apps/files_external/tests/Storage/Amazons3Test.php b/apps/files_external/tests/Storage/Amazons3Test.php index bcfdc191154..b28ff23b43e 100644 --- a/apps/files_external/tests/Storage/Amazons3Test.php +++ b/apps/files_external/tests/Storage/Amazons3Test.php @@ -44,6 +44,9 @@ class Amazons3Test extends \Test\Files\Storage\Storage { } 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(); } }