summaryrefslogtreecommitdiffstats
path: root/apps/files_external/tests
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2014-01-31 16:06:11 +0100
committerVincent Petry <pvince81@owncloud.com>2014-02-19 18:34:08 +0100
commitb2b35cd3358113db95651d705251eda290b40ba7 (patch)
tree5a8b39a105e3a7c06f6fcee0412813cf85c4226e /apps/files_external/tests
parent952584e9c782d196eb2bcd6df1e3ecdf21adcb55 (diff)
downloadnextcloud-server-b2b35cd3358113db95651d705251eda290b40ba7.tar.gz
nextcloud-server-b2b35cd3358113db95651d705251eda290b40ba7.zip
Fixed ext storage webdav path encoding
- Some WebDAV servers like lighttpd need paths in URLs to be properly encoded - Added error log output when curl connection failed - Added check for 'resourcetype' in case the WebDAV server doesn't support/return it - Fixed touch() to return false if the server doesn't implement PROPPATCH - Added optional delay in WebDAV unit tests to use when testing against lighttpd's WebDAV
Diffstat (limited to 'apps/files_external/tests')
-rw-r--r--apps/files_external/tests/config.php6
-rw-r--r--apps/files_external/tests/webdav.php3
2 files changed, 8 insertions, 1 deletions
diff --git a/apps/files_external/tests/config.php b/apps/files_external/tests/config.php
index e296bfcb5b2..767c0adf58e 100644
--- a/apps/files_external/tests/config.php
+++ b/apps/files_external/tests/config.php
@@ -21,7 +21,11 @@ return array(
'host'=>'localhost',
'user'=>'test',
'password'=>'test',
- 'root'=>'/owncloud/files/webdav.php',
+ 'root'=>'',
+ // wait delay in seconds after write operations
+ // (only in tests)
+ // set to higher value for lighttpd webdav
+ 'wait'=> 0
),
'owncloud'=>array(
'run'=>true,
diff --git a/apps/files_external/tests/webdav.php b/apps/files_external/tests/webdav.php
index 1f9b767eca6..74e905ccc89 100644
--- a/apps/files_external/tests/webdav.php
+++ b/apps/files_external/tests/webdav.php
@@ -18,6 +18,9 @@ class DAV extends Storage {
if ( ! is_array($this->config) or ! isset($this->config['webdav']) or ! $this->config['webdav']['run']) {
$this->markTestSkipped('WebDAV backend not configured');
}
+ if (isset($this->config['webdav']['wait'])) {
+ $this->waitDelay = $this->config['webdav']['wait'];
+ }
$this->config['webdav']['root'] .= '/' . $id; //make sure we have an new empty folder to work in
$this->instance = new \OC\Files\Storage\DAV($this->config['webdav']);
$this->instance->mkdir('/');