skip the files_external test cases the correct way

This commit is contained in:
Robin Appelman 2012-10-11 21:12:52 +02:00
parent 29c43b7d61
commit 5256301a53
8 changed files with 125 additions and 134 deletions

View File

@ -1,43 +1,42 @@
<?php <?php
/** /**
* ownCloud * ownCloud
* *
* @author Michael Gapczynski * @author Michael Gapczynski
* @copyright 2012 Michael Gapczynski mtgap@owncloud.com * @copyright 2012 Michael Gapczynski mtgap@owncloud.com
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
* version 3 of the License, or any later version. * version 3 of the License, or any later version.
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU AFFERO GENERAL PUBLIC LICENSE for more details. * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
* *
* You should have received a copy of the GNU Affero General Public * You should have received a copy of the GNU Affero General Public
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
$config = include('apps/files_external/tests/config.php'); class Test_Filestorage_AmazonS3 extends Test_FileStorage {
if (!is_array($config) or !isset($config['amazons3']) or !$config['amazons3']['run']) {
abstract class Test_Filestorage_AmazonS3 extends Test_FileStorage{}
return;
} else {
class Test_Filestorage_AmazonS3 extends Test_FileStorage {
private $config; private $config;
private $id; private $id;
public function setUp() { public function setUp() {
$id = uniqid(); $id = uniqid();
$this->config = include('apps/files_external/tests/config.php'); $this->config = include('files_external/tests/config.php');
$this->config['amazons3']['bucket'] = $id; // Make sure we have a new empty bucket to work in if (!is_array($this->config) or !isset($this->config['amazons3']) or !$this->config['amazons3']['run']) {
$this->instance = new OC_Filestorage_AmazonS3($this->config['amazons3']); $this->markTestSkipped('AmazonS3 backend not configured');
} }
$this->config['amazons3']['bucket'] = $id; // Make sure we have a new empty bucket to work in
$this->instance = new OC_Filestorage_AmazonS3($this->config['amazons3']);
}
public function tearDown() { public function tearDown() {
if ($this->instance) {
$s3 = new AmazonS3(array('key' => $this->config['amazons3']['key'], 'secret' => $this->config['amazons3']['secret'])); $s3 = new AmazonS3(array('key' => $this->config['amazons3']['key'], 'secret' => $this->config['amazons3']['secret']));
if ($s3->delete_all_objects($this->id)) { if ($s3->delete_all_objects($this->id)) {
$s3->delete_bucket($this->id); $s3->delete_bucket($this->id);

View File

@ -8,7 +8,7 @@ return array(
'root'=>'/test', 'root'=>'/test',
), ),
'webdav'=>array( 'webdav'=>array(
'run'=>false, 'run'=>true,
'host'=>'localhost', 'host'=>'localhost',
'user'=>'test', 'user'=>'test',
'password'=>'test', 'password'=>'test',
@ -26,11 +26,11 @@ return array(
'run'=>false, 'run'=>false,
'user'=>'test:tester', 'user'=>'test:tester',
'token'=>'testing', 'token'=>'testing',
'host'=>'localhost:8080/auth', 'host'=>'ubuntu.local:8080/auth',
'root'=>'/', 'root'=>'/',
), ),
'smb'=>array( 'smb'=>array(
'run'=>false, 'run'=>true,
'user'=>'test', 'user'=>'test',
'password'=>'test', 'password'=>'test',
'host'=>'localhost', 'host'=>'localhost',

View File

@ -6,22 +6,21 @@
* See the COPYING-README file. * See the COPYING-README file.
*/ */
$config=include('files_external/tests/config.php'); class Test_Filestorage_Dropbox extends Test_FileStorage {
if(!is_array($config) or !isset($config['dropbox']) or !$config['dropbox']['run']) { private $config;
abstract class Test_Filestorage_Dropbox extends Test_FileStorage{}
return;
}else{
class Test_Filestorage_Dropbox extends Test_FileStorage {
private $config;
public function setUp() { public function setUp() {
$id=uniqid(); $id = uniqid();
$this->config=include('files_external/tests/config.php'); $this->config = include('files_external/tests/config.php');
$this->config['dropbox']['root'].='/'.$id;//make sure we have an new empty folder to work in if (!is_array($this->config) or !isset($this->config['dropbox']) or !$this->config['dropbox']['run']) {
$this->instance=new OC_Filestorage_Dropbox($this->config['dropbox']); $this->markTestSkipped('Dropbox backend not configured');
} }
$this->config['dropbox']['root'] .= '/' . $id; //make sure we have an new empty folder to work in
$this->instance = new OC_Filestorage_Dropbox($this->config['dropbox']);
}
public function tearDown() { public function tearDown() {
if ($this->instance) {
$this->instance->unlink('/'); $this->instance->unlink('/');
} }
} }

View File

@ -6,22 +6,21 @@
* See the COPYING-README file. * See the COPYING-README file.
*/ */
$config=include('apps/files_external/tests/config.php'); class Test_Filestorage_FTP extends Test_FileStorage {
if(!is_array($config) or !isset($config['ftp']) or !$config['ftp']['run']) { private $config;
abstract class Test_Filestorage_FTP extends Test_FileStorage{}
return;
}else{
class Test_Filestorage_FTP extends Test_FileStorage {
private $config;
public function setUp() { public function setUp() {
$id=uniqid(); $id = uniqid();
$this->config=include('apps/files_external/tests/config.php'); $this->config = include('files_external/tests/config.php');
$this->config['ftp']['root'].='/'.$id;//make sure we have an new empty folder to work in if (!is_array($this->config) or !isset($this->config['ftp']) or !$this->config['ftp']['run']) {
$this->instance=new OC_Filestorage_FTP($this->config['ftp']); $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_Filestorage_FTP($this->config['ftp']);
}
public function tearDown() { public function tearDown() {
if ($this->instance) {
OCP\Files::rmdirr($this->instance->constructUrl('')); OCP\Files::rmdirr($this->instance->constructUrl(''));
} }
} }

View File

@ -1,42 +1,41 @@
<?php <?php
/** /**
* ownCloud * ownCloud
* *
* @author Michael Gapczynski * @author Michael Gapczynski
* @copyright 2012 Michael Gapczynski mtgap@owncloud.com * @copyright 2012 Michael Gapczynski mtgap@owncloud.com
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
* version 3 of the License, or any later version. * version 3 of the License, or any later version.
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU AFFERO GENERAL PUBLIC LICENSE for more details. * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
* *
* You should have received a copy of the GNU Affero General Public * You should have received a copy of the GNU Affero General Public
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
$config=include('apps/files_external/tests/config.php'); class Test_Filestorage_Google extends Test_FileStorage {
if(!is_array($config) or !isset($config['google']) or !$config['google']['run']) {
abstract class Test_Filestorage_Google extends Test_FileStorage{}
return;
}else{
class Test_Filestorage_Google extends Test_FileStorage {
private $config; private $config;
public function setUp() { public function setUp() {
$id=uniqid(); $id = uniqid();
$this->config=include('apps/files_external/tests/config.php'); $this->config = include('files_external/tests/config.php');
$this->config['google']['root'].='/'.$id;//make sure we have an new empty folder to work in if (!is_array($this->config) or !isset($this->config['google']) or !$this->config['google']['run']) {
$this->instance=new OC_Filestorage_Google($this->config['google']); $this->markTestSkipped('Google backend not configured');
} }
$this->config['google']['root'] .= '/' . $id; //make sure we have an new empty folder to work in
$this->instance = new OC_Filestorage_Google($this->config['google']);
}
public function tearDown() { public function tearDown() {
if ($this->instance) {
$this->instance->rmdir('/'); $this->instance->rmdir('/');
} }
} }

View File

@ -6,23 +6,21 @@
* See the COPYING-README file. * See the COPYING-README file.
*/ */
$config=include('apps/files_external/tests/config.php'); class Test_Filestorage_SMB extends Test_FileStorage {
private $config;
if(!is_array($config) or !isset($config['smb']) or !$config['smb']['run']) { public function setUp() {
abstract class Test_Filestorage_SMB extends Test_FileStorage{} $id = uniqid();
return; $this->config = include('files_external/tests/config.php');
}else{ if (!is_array($this->config) or !isset($this->config['smb']) or !$this->config['smb']['run']) {
class Test_Filestorage_SMB extends Test_FileStorage { $this->markTestSkipped('Samba backend not configured');
private $config;
public function setUp() {
$id=uniqid();
$this->config=include('apps/files_external/tests/config.php');
$this->config['smb']['root'].=$id;//make sure we have an new empty folder to work in
$this->instance=new OC_Filestorage_SMB($this->config['smb']);
} }
$this->config['smb']['root'] .= $id; //make sure we have an new empty folder to work in
$this->instance = new OC_Filestorage_SMB($this->config['smb']);
}
public function tearDown() { public function tearDown() {
if ($this->instance) {
OCP\Files::rmdirr($this->instance->constructUrl('')); OCP\Files::rmdirr($this->instance->constructUrl(''));
} }
} }

View File

@ -6,25 +6,23 @@
* See the COPYING-README file. * See the COPYING-README file.
*/ */
$config=include('apps/files_external/tests/config.php'); class Test_Filestorage_SWIFT extends Test_FileStorage {
if(!is_array($config) or !isset($config['swift']) or !$config['swift']['run']) { private $config;
abstract class Test_Filestorage_SWIFT extends Test_FileStorage{}
return;
}else{
class Test_Filestorage_SWIFT extends Test_FileStorage {
private $config;
public function setUp() { public function setUp() {
$id=uniqid(); $id = uniqid();
$this->config=include('apps/files_external/tests/config.php'); $this->config = include('files_external/tests/config.php');
$this->config['swift']['root'].='/'.$id;//make sure we have an new empty folder to work in if (!is_array($this->config) or !isset($this->config['swift']) or !$this->config['swift']['run']) {
$this->instance=new OC_Filestorage_SWIFT($this->config['swift']); $this->markTestSkipped('OpenStack SWIFT backend not configured');
} }
$this->config['swift']['root'] .= '/' . $id; //make sure we have an new empty folder to work in
$this->instance = new OC_Filestorage_SWIFT($this->config['swift']);
}
public function tearDown() { public function tearDown() {
$this->instance->rmdir(''); if ($this->instance) {
$this->instance->rmdir('');
} }
} }
} }

View File

@ -6,22 +6,21 @@
* See the COPYING-README file. * See the COPYING-README file.
*/ */
$config=include('apps/files_external/tests/config.php'); class Test_Filestorage_DAV extends Test_FileStorage {
if(!is_array($config) or !isset($config['webdav']) or !$config['webdav']['run']) { private $config;
abstract class Test_Filestorage_DAV extends Test_FileStorage{}
return;
}else{
class Test_Filestorage_DAV extends Test_FileStorage {
private $config;
public function setUp() { public function setUp() {
$id=uniqid(); $id = uniqid();
$this->config=include('apps/files_external/tests/config.php'); $this->config = include('files_external/tests/config.php');
$this->config['webdav']['root'].='/'.$id;//make sure we have an new empty folder to work in if (!is_array($this->config) or !isset($this->config['webdav']) or !$this->config['webdav']['run']) {
$this->instance=new OC_Filestorage_DAV($this->config['webdav']); $this->markTestSkipped('WebDAV backend not configured');
} }
$this->config['webdav']['root'] .= '/' . $id; //make sure we have an new empty folder to work in
$this->instance = new OC_Filestorage_DAV($this->config['webdav']);
}
public function tearDown() { public function tearDown() {
if ($this->instance) {
$this->instance->rmdir('/'); $this->instance->rmdir('/');
} }
} }