upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-11 09:42:09 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 57

Merge pull request #57185 from nextcloud/fix/fix-files-external-tests

Browse source
This commit is contained in:
Kate 2026-01-14 11:46:28 +01:00 committed by GitHub
commit ad8576f02d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.github/workflows/files-external-smb.yml vendored
View file

@ -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

2
apps/files_external/tests/Storage/Amazons3MultiPartTest.php
View file

@ -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,

2
apps/files_external/tests/Storage/Amazons3Test.php
View file

@ -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);
}

2
apps/files_external/tests/Storage/FtpTest.php
View file

@ -24,7 +24,7 @@ class FtpTest extends \Test\Files\Storage\Storage {
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);

2
apps/files_external/tests/Storage/OwncloudTest.php
View file

@ -24,7 +24,7 @@ class OwncloudTest extends \Test\Files\Storage\Storage {
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('/');

2
apps/files_external/tests/Storage/SFTP_KeyTest.php
View file

@ -24,7 +24,7 @@ class SFTP_KeyTest extends \Test\Files\Storage\Storage {
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']);

2
apps/files_external/tests/Storage/SftpTest.php
View file

@ -28,7 +28,7 @@ class SftpTest extends \Test\Files\Storage\Storage {
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('/');

2
apps/files_external/tests/Storage/SmbTest.php
View file

@ -32,7 +32,7 @@ class SmbTest extends \Test\Files\Storage\Storage {
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'] .= '/';
}

2
apps/files_external/tests/Storage/SwiftTest.php
View file

@ -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);
}

2
apps/files_external/tests/Storage/WebdavTest.php
View file

@ -27,7 +27,7 @@ class WebdavTest extends \Test\Files\Storage\Storage {
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'];
}