Skip to content

test: run all files_external tests for S3 #53378

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
susnux merged 3 commits into from
Jun 10, 2025
Merged

test: run all files_external tests for S3 #53378

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de338d9
test: fix s3 external storage tests to run all storages on ci
susnux Jun 6, 2025
22b9d91
test: only skip tests failing on localstack for localstack
susnux Jun 6, 2025
5f200c7
test: reenable localstack tests (bug fixed) but disable MinIO version…
susnux Jun 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
test: reenable localstack tests (bug fixed) but disable MinIO version… 
…ed copy test

Signed-off-by: Ferdinand Thiessen <[email protected]>
  • Loading branch information
@susnux
susnux committed Jun 10, 2025
commit 5f200c776529d1763c0854c35f00aff33f3fc869
8 changes: 4 additions & 4 deletions .github/workflows/files-external-s3.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ jobs:
strategy:
fail-fast: false
matrix:
php-versions: ['8.1', '8.2', '8.3', '8.4']
php-versions: ['8.1', '8.2', '8.4']
include:
- php-versions: '8.2'
- php-versions: '8.3'
coverage: ${{ github.event_name != 'pull_request' }}

name: php${{ matrix.php-versions }}-s3-minio
Expand Down Expand Up @@ -88,7 +88,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: |
Expand Down Expand Up @@ -134,7 +134,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: ${{ github.event_name != 'pull_request' }}
Expand Down
8 changes: 0 additions & 8 deletions apps/files_external/tests/Storage/Amazons3MultiPartTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,4 @@ protected function tearDown(): void {
public function testStat(): void {
$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();
}
}
11 changes: 2 additions & 9 deletions apps/files_external/tests/Storage/Amazons3Test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@
* @package OCA\Files_External\Tests\Storage
*/
class Amazons3Test extends \Test\Files\Storage\Storage {
private $config;
protected $config;
/** @var AmazonS3 */
protected $instance;

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);
Expand All @@ -44,11 +44,4 @@ protected function tearDown(): void {
public function testStat(): void {
$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();
}
}
8 changes: 8 additions & 0 deletions apps/files_external/tests/Storage/VersionedAmazonS3Test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,12 @@ protected function setUp(): void {
$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();
}
}
Loading