diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-12-03 18:02:22 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-12-03 18:02:22 +0100 |
| commit | be30b1a8de2c7858be3f1dfa792504478af70eb4 (patch) | |
| tree | eb3f69b006041c1a586479bb59dbf557df48eec0 /apps/files_external/tests/ftp.php | |
| parent | 18663100d9f68400fba1fc344874aacb62bb4659 (diff) | |
| parent | 4cb760a92402ab3eb8550fb05b05eae800030680 (diff) | |
| download | nextcloud-server-be30b1a8de2c7858be3f1dfa792504478af70eb4.tar.gz nextcloud-server-be30b1a8de2c7858be3f1dfa792504478af70eb4.zip | |
merge master into filesystem
Diffstat (limited to 'apps/files_external/tests/ftp.php')
| -rw-r--r-- | apps/files_external/tests/ftp.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/apps/files_external/tests/ftp.php b/apps/files_external/tests/ftp.php index 970c83b0bca..9998a479bf8 100644 --- a/apps/files_external/tests/ftp.php +++ b/apps/files_external/tests/ftp.php @@ -14,7 +14,7 @@ class FTP extends Storage { public function setUp() { $id = uniqid(); $this->config = include('files_external/tests/config.php'); - if (!is_array($this->config) or !isset($this->config['ftp']) or !$this->config['ftp']['run']) { + if ( ! is_array($this->config) or ! isset($this->config['ftp']) or ! $this->config['ftp']['run']) { $this->markTestSkipped('FTP backend not configured'); } $this->config['ftp']['root'] .= '/' . $id; //make sure we have an new empty folder to work in @@ -28,7 +28,11 @@ class FTP extends Storage { } public function testConstructUrl(){ - $config = array ( 'host' => 'localhost', 'user' => 'ftp', 'password' => 'ftp', 'root' => '/', 'secure' => false ); + $config = array ( 'host' => 'localhost', + 'user' => 'ftp', + 'password' => 'ftp', + 'root' => '/', + 'secure' => false ); $instance = new OC_Filestorage_FTP($config); $this->assertEqual('ftp://ftp:ftp@localhost/', $instance->constructUrl('')); |