only run tests for files_external when asked for explicitly

4 files changed, 59 insertions, 35 deletions

diff --git a/apps/files_external/tests/config.php b/apps/files_external/tests/config.php
index 9b40d2b98cf..fa4c74a6e26 100644
--- a/apps/files_external/tests/config.php
+++ b/apps/files_external/tests/config.php
@@ -1,18 +1,21 @@
 <?php
 return array(
 	'ftp'=>array(
+		'run'=>false,
 		'host'=>'localhost',
 		'user'=>'test',
 		'password'=>'test',
 		'root'=>'/test',
 	),
 	'webdav'=>array(
+		'run'=>false,
 		'host'=>'localhost',
 		'user'=>'test',
 		'password'=>'test',
 		'root'=>'/owncloud/files/webdav.php',
 	),
 	'google'=>array(
+		'run'=>false,
 		'consumer_key'=>'anonymous',
 		'consumer_secret'=>'anonymous',
 		'token'=>'test',
diff --git a/apps/files_external/tests/ftp.php b/apps/files_external/tests/ftp.php
index aa565751ba3..e30fb9a1c38 100644
--- a/apps/files_external/tests/ftp.php
+++ b/apps/files_external/tests/ftp.php
@@ -5,19 +5,26 @@
  * later.
  * See the COPYING-README file.
  */
+ 
+$config=include('apps/files_external/tests/config.php');
+if(!is_array($config) or !isset($config['ftp']) or !$config['ftp']['run']){
+	abstract class Test_Filestorage_FTP extends Test_FileStorage{}
+	return;
+}else{
+	class Test_Filestorage_FTP extends Test_FileStorage {
+		private $config;
+		private $id;
 
-class Test_Filestorage_FTP extends Test_FileStorage {
-	private $config;
-	private $id;
+		public function setUp(){
+			$id=uniqid();
+			$this->config=include('apps/files_external/tests/config.php');
+			$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 setUp(){
-		$id=uniqid();
-		$this->config=include('apps/files_external/tests/config.php');
-		$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(){
-		OC_Helper::rmdirr($this->instance->constructUrl(''));
+		public function tearDown(){
+			OC_Helper::rmdirr($this->instance->constructUrl(''));
+		}
 	}
 }
+
diff --git a/apps/files_external/tests/google.php b/apps/files_external/tests/google.php
index 1c028945228..08116f0e748 100644
--- a/apps/files_external/tests/google.php
+++ b/apps/files_external/tests/google.php
@@ -20,19 +20,26 @@
 * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-class Test_Filestorage_Google extends Test_FileStorage {
-	
-	private $config;
-	private $id;
+$config=include('apps/files_external/tests/config.php');
+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 $id;
 
-	public function setUp(){
-		$id=uniqid();
-		$this->config=include('apps/files_external/tests/config.php');
-		$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 setUp(){
+			$id=uniqid();
+			$this->config=include('apps/files_external/tests/config.php');
+			$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(){
-		$this->instance->rmdir('/');
+		public function tearDown(){
+			$this->instance->rmdir('/');
+		}
 	}
 }
+
diff --git a/apps/files_external/tests/webdav.php b/apps/files_external/tests/webdav.php
index 51799290540..144659819b6 100644
--- a/apps/files_external/tests/webdav.php
+++ b/apps/files_external/tests/webdav.php
@@ -6,18 +6,25 @@
  * See the COPYING-README file.
  */
 
-class Test_Filestorage_DAV extends Test_FileStorage {
-	private $config;
-	private $id;
+$config=include('apps/files_external/tests/config.php');
+if(!is_array($config) or !isset($config['webdav']) or !$config['webdav']['run']){
+	abstract class Test_Filestorage_DAV extends Test_FileStorage{}
+	return;
+}else{
+	class Test_Filestorage_DAV extends Test_FileStorage {
+		private $config;
+		private $id;
 
-	public function setUp(){
-		$id=uniqid();
-		$this->config=include('apps/files_external/tests/config.php');
-		$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 setUp(){
+			$id=uniqid();
+			$this->config=include('apps/files_external/tests/config.php');
+			$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(){
-		$this->instance->rmdir('/');
+		public function tearDown(){
+			$this->instance->rmdir('/');
+		}
 	}
 }
+