only run archive tests if the test data is available

remotes/origin/stable4
Robin Appelman 13 years ago
parent 71cdfdcec8
commit 9ee931e790
  1. 18
      apps/files_archive/tests/tar.php
  2. 18
      apps/files_archive/tests/zip.php

@ -8,13 +8,17 @@
require_once('archive.php'); require_once('archive.php');
class Test_Archive_TAR extends Test_Archive{ if(is_dir(OC::$SERVERROOT.'/apps/files_archive/tests/data')){
protected function getExisting(){ class Test_Archive_TAR extends Test_Archive{
$dir=OC::$SERVERROOT.'/apps/files_archive/tests/data'; protected function getExisting(){
return new OC_Archive_TAR($dir.'/data.tar.gz'); $dir=OC::$SERVERROOT.'/apps/files_archive/tests/data';
} return new OC_Archive_TAR($dir.'/data.tar.gz');
}
protected function getNew(){ protected function getNew(){
return new OC_Archive_TAR(OC_Helper::tmpFile('.tar.gz')); return new OC_Archive_TAR(OC_Helper::tmpFile('.tar.gz'));
}
} }
}else{
abstract class Test_Archive_TAR extends Test_Archive{}
} }

@ -8,13 +8,17 @@
require_once('archive.php'); require_once('archive.php');
class Test_Archive_ZIP extends Test_Archive{ if(is_dir(OC::$SERVERROOT.'/apps/files_archive/tests/data')){
protected function getExisting(){ class Test_Archive_ZIP extends Test_Archive{
$dir=OC::$SERVERROOT.'/apps/files_archive/tests/data'; protected function getExisting(){
return new OC_Archive_ZIP($dir.'/data.zip'); $dir=OC::$SERVERROOT.'/apps/files_archive/tests/data';
} return new OC_Archive_ZIP($dir.'/data.zip');
}
protected function getNew(){ protected function getNew(){
return new OC_Archive_ZIP(OC_Helper::tmpFile('.zip')); return new OC_Archive_ZIP(OC_Helper::tmpFile('.zip'));
}
} }
}else{
abstract class Test_Archive_ZIP extends Test_Archive{}
} }

Loading…
Cancel
Save