summaryrefslogtreecommitdiffstats
path: root/apps/files_external/tests/backends
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-02-16 13:56:40 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2015-02-16 13:56:40 +0100
commit6cdc7a890a4a6eb20060c922a351fb24221c7cb7 (patch)
treec0102df0bbfa0f24462877deb5931ee5da35d79a /apps/files_external/tests/backends
parent78febb2ee594bac5d483f7c8534ed5eb33c2c528 (diff)
parent60cadf5647f44437cb5faa76a2888a70f00dbeb4 (diff)
downloadnextcloud-server-6cdc7a890a4a6eb20060c922a351fb24221c7cb7.tar.gz
nextcloud-server-6cdc7a890a4a6eb20060c922a351fb24221c7cb7.zip
Merge pull request #14076 from owncloud/autotest-external-ftp
[files_external] ftp tests
Diffstat (limited to 'apps/files_external/tests/backends')
-rw-r--r--apps/files_external/tests/backends/ftp.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/files_external/tests/backends/ftp.php b/apps/files_external/tests/backends/ftp.php
index 842b7f43fa8..d62759889b1 100644
--- a/apps/files_external/tests/backends/ftp.php
+++ b/apps/files_external/tests/backends/ftp.php
@@ -15,12 +15,12 @@ class FTP extends Storage {
parent::setUp();
$id = $this->getUniqueID();
- $this->config = include('files_external/tests/config.php');
- if ( ! is_array($this->config) or ! isset($this->config['ftp']) or ! $this->config['ftp']['run']) {
+ $this->config = include('files_external/tests/config.ftp.php');
+ if ( ! is_array($this->config) or ! $this->config['run']) {
$this->markTestSkipped('FTP backend not configured');
}
- $this->config['ftp']['root'] .= '/' . $id; //make sure we have an new empty folder to work in
- $this->instance = new \OC\Files\Storage\FTP($this->config['ftp']);
+ $this->config['root'] .= '/' . $id; //make sure we have an new empty folder to work in
+ $this->instance = new \OC\Files\Storage\FTP($this->config);
$this->instance->mkdir('/');
}