diff options
author | Lukas Reschke <lukas@statuscode.ch> | 2014-02-19 18:57:59 +0100 |
---|---|---|
committer | Lukas Reschke <lukas@statuscode.ch> | 2014-02-19 18:57:59 +0100 |
commit | a4f71267f0c7ef7a2a8d23ac0a47279ed8bdda5e (patch) | |
tree | 5a8b39a105e3a7c06f6fcee0412813cf85c4226e /apps/files_external/tests | |
parent | 952584e9c782d196eb2bcd6df1e3ecdf21adcb55 (diff) | |
parent | b2b35cd3358113db95651d705251eda290b40ba7 (diff) | |
download | nextcloud-server-a4f71267f0c7ef7a2a8d23ac0a47279ed8bdda5e.tar.gz nextcloud-server-a4f71267f0c7ef7a2a8d23ac0a47279ed8bdda5e.zip |
Merge pull request #7027 from owncloud/extstorage-webdavurlencodingfixes
Fixed ext storage webdav path encoding
Diffstat (limited to 'apps/files_external/tests')
-rw-r--r-- | apps/files_external/tests/config.php | 6 | ||||
-rw-r--r-- | apps/files_external/tests/webdav.php | 3 |
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('/'); |