From 9ee931e7906f56e651a25f692588eaa586850525 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 15 Apr 2012 13:34:54 +0200
Subject: [PATCH] only run archive tests if the test data is available
---
apps/files_archive/tests/tar.php | 18 +++++++++++-------
apps/files_archive/tests/zip.php | 18 +++++++++++-------
2 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/apps/files_archive/tests/tar.php b/apps/files_archive/tests/tar.php
index 193a65b550..aa46455e65 100644
--- a/apps/files_archive/tests/tar.php
+++ b/apps/files_archive/tests/tar.php
@@ -8,13 +8,17 @@
require_once('archive.php');
-class Test_Archive_TAR extends Test_Archive{
- protected function getExisting(){
- $dir=OC::$SERVERROOT.'/apps/files_archive/tests/data';
- return new OC_Archive_TAR($dir.'/data.tar.gz');
- }
+if(is_dir(OC::$SERVERROOT.'/apps/files_archive/tests/data')){
+ class Test_Archive_TAR extends Test_Archive{
+ protected function getExisting(){
+ $dir=OC::$SERVERROOT.'/apps/files_archive/tests/data';
+ return new OC_Archive_TAR($dir.'/data.tar.gz');
+ }
- protected function getNew(){
- return new OC_Archive_TAR(OC_Helper::tmpFile('.tar.gz'));
+ protected function getNew(){
+ return new OC_Archive_TAR(OC_Helper::tmpFile('.tar.gz'));
+ }
}
+}else{
+ abstract class Test_Archive_TAR extends Test_Archive{}
}
diff --git a/apps/files_archive/tests/zip.php b/apps/files_archive/tests/zip.php
index 3ff713eda7..18a2997c1a 100644
--- a/apps/files_archive/tests/zip.php
+++ b/apps/files_archive/tests/zip.php
@@ -8,13 +8,17 @@
require_once('archive.php');
-class Test_Archive_ZIP extends Test_Archive{
- protected function getExisting(){
- $dir=OC::$SERVERROOT.'/apps/files_archive/tests/data';
- return new OC_Archive_ZIP($dir.'/data.zip');
- }
+if(is_dir(OC::$SERVERROOT.'/apps/files_archive/tests/data')){
+ class Test_Archive_ZIP extends Test_Archive{
+ protected function getExisting(){
+ $dir=OC::$SERVERROOT.'/apps/files_archive/tests/data';
+ return new OC_Archive_ZIP($dir.'/data.zip');
+ }
- protected function getNew(){
- return new OC_Archive_ZIP(OC_Helper::tmpFile('.zip'));
+ protected function getNew(){
+ return new OC_Archive_ZIP(OC_Helper::tmpFile('.zip'));
+ }
}
+}else{
+ abstract class Test_Archive_ZIP extends Test_Archive{}
}
--
GitLab