From 6477e39be931e33864c64bfcea72391e51f44213 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Fri, 13 Feb 2015 15:27:05 +0100 Subject: [PATCH] also make sure we have a leading slash for the test root --- apps/files_external/tests/backends/smb.php | 5 +++-- apps/files_external/tests/backends/webdav.php | 2 -- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/apps/files_external/tests/backends/smb.php b/apps/files_external/tests/backends/smb.php index b66459c42a..4b1150c6a2 100644 --- a/apps/files_external/tests/backends/smb.php +++ b/apps/files_external/tests/backends/smb.php @@ -10,8 +10,6 @@ namespace Test\Files\Storage; class SMB extends Storage { - private $config; - protected function setUp() { parent::setUp(); @@ -20,6 +18,9 @@ class SMB extends Storage { if (!is_array($config) or !$config['run']) { $this->markTestSkipped('Samba backend not configured'); } + if (substr($config['root'], -1, 1) != '/') { + $config['root'] .= '/'; + } $config['root'] .= $id; //make sure we have an new empty folder to work in $this->instance = new \OC\Files\Storage\SMB($config); $this->instance->mkdir('/'); diff --git a/apps/files_external/tests/backends/webdav.php b/apps/files_external/tests/backends/webdav.php index c390612810..c454c8e4a9 100644 --- a/apps/files_external/tests/backends/webdav.php +++ b/apps/files_external/tests/backends/webdav.php @@ -10,8 +10,6 @@ namespace Test\Files\Storage; class DAV extends Storage { - private $config; - protected function setUp() { parent::setUp();