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

Author: provokateurin

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

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

apps/files_external/tests/Storage/Amazons3MultiPartTest.php

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

apps/files_external/tests/Storage/Amazons3Test.php

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

apps/files_external/tests/Storage/FtpTest.php

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

apps/files_external/tests/Storage/OwncloudTest.php

@@ -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('/');

apps/files_external/tests/Storage/SFTP_KeyTest.php

@@ -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']);

apps/files_external/tests/Storage/SftpTest.php

@@ -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('/');

apps/files_external/tests/Storage/SmbTest.php

@@ -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'] .= '/';
 		}

apps/files_external/tests/Storage/SwiftTest.php

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

apps/files_external/tests/Storage/WebdavTest.php

@@ -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'];
 		}