Skip to content

fix(tests): Fix files_external tests #57185

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
provokateurin merged 2 commits into from
Jan 14, 2026
Merged

fix(tests): Fix files_external tests #57185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
166febb
fix(tests): Use absolute paths for files_external tests configuration…
come-nc Dec 18, 2025
663f682
test: use a different smb image for smb testing
icewind1991 Jan 13, 2026
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
8 changes: 7 additions & 1 deletion .github/workflows/files-external-smb.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,13 @@ jobs:

services:
samba:
image: ghcr.io/nextcloud/continuous-integration-samba:latest # zizmor: ignore[unpinned-images]
image: ghcr.io/servercontainers/samba:smbd-only-a3.18.0-s4.18.2-r0
env:
ACCOUNT_test: test
UID_test: 1000
SAMBA_VOLUME_CONFIG_test: "[public]; path=/tmp; valid users = test; guest ok = no; read only = no; browseable = yes"
options: >-
--health-cmd=true
ports:
- 445:445

Expand Down
2 changes: 1 addition & 1 deletion apps/files_external/tests/Storage/Amazons3MultiPartTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class Amazons3MultiPartTest extends \Test\Files\Storage\Storage {
protected function setUp(): void {
parent::setUp();

$this->loadConfig('files_external/tests/config.amazons3.php');
$this->loadConfig(__DIR__ . '/../config.amazons3.php');

$this->instance = new AmazonS3($this->config + [
'putSizeLimit' => 1,
Expand Down
2 changes: 1 addition & 1 deletion apps/files_external/tests/Storage/Amazons3Test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class Amazons3Test extends \Test\Files\Storage\Storage {
protected function setUp(): void {
parent::setUp();

$this->loadConfig('files_external/tests/config.amazons3.php');
$this->loadConfig(__DIR__ . '/../config.amazons3.php');
$this->instance = new AmazonS3($this->config);
}

Expand Down
2 changes: 1 addition & 1 deletion apps/files_external/tests/Storage/FtpTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ protected function setUp(): void {
parent::setUp();

$id = $this->getUniqueID();
$this->loadConfig('files_external/tests/config.ftp.php');
$this->loadConfig(__DIR__ . '/../config.ftp.php');

$rootInstance = new FTP($this->config);
$rootInstance->mkdir($id);
Expand Down
2 changes: 1 addition & 1 deletion apps/files_external/tests/Storage/OwncloudTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ protected function setUp(): void {
parent::setUp();

$id = $this->getUniqueID();
$this->loadConfig('files_external/tests/config.php');
$this->loadConfig(__DIR__ . '/../config.php');
$this->config['owncloud']['root'] .= '/' . $id; //make sure we have an new empty folder to work in
$this->instance = new OwnCloud($this->config['owncloud']);
$this->instance->mkdir('/');
Expand Down
2 changes: 1 addition & 1 deletion apps/files_external/tests/Storage/SFTP_KeyTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ protected function setUp(): void {
parent::setUp();

$id = $this->getUniqueID();
$this->loadConfig('files_external/tests/config.php');
$this->loadConfig(__DIR__ . '/../config.php');
// Make sure we have an new empty folder to work in
$this->config['sftp_key']['root'] .= '/' . $id;
$this->instance = new SFTP_Key($this->config['sftp_key']);
Expand Down
2 changes: 1 addition & 1 deletion apps/files_external/tests/Storage/SftpTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ protected function setUp(): void {
parent::setUp();

$id = $this->getUniqueID();
$this->loadConfig('files_external/tests/config.sftp.php');
$this->loadConfig(__DIR__ . '/../config.sftp.php');
$this->config['root'] .= '/' . $id; //make sure we have an new empty folder to work in
$this->instance = new SFTP($this->config);
$this->instance->mkdir('/');
Expand Down
2 changes: 1 addition & 1 deletion apps/files_external/tests/Storage/SmbTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ protected function setUp(): void {
parent::setUp();

$id = $this->getUniqueID();
$this->loadConfig('files_external/tests/config.smb.php');
$this->loadConfig(__DIR__ . '/../config.smb.php');
if (substr($this->config['root'], -1, 1) != '/') {
$this->config['root'] .= '/';
}
Expand Down
2 changes: 1 addition & 1 deletion apps/files_external/tests/Storage/SwiftTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class SwiftTest extends \Test\Files\Storage\Storage {
protected function setUp(): void {
parent::setUp();

$this->loadConfig('files_external/tests/config.swift.php');
$this->loadConfig(__DIR__ . '/../config.swift.php');
$this->instance = new Swift($this->config);
}

Expand Down
2 changes: 1 addition & 1 deletion apps/files_external/tests/Storage/WebdavTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ protected function setUp(): void {
parent::setUp();

$id = $this->getUniqueID();
$this->loadConfig('files_external/tests/config.webdav.php');
$this->loadConfig(__DIR__ . '/../config.webdav.php');
if (isset($this->config['wait'])) {
$this->waitDelay = $this->config['wait'];
}
Expand Down
Loading