aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2014-08-16 10:26:26 +0200
committerMorris Jobke <hey@morrisjobke.de>2014-08-21 08:50:39 +0200
commitbcb3d03f6cfc3e308c83280bee442f2b9060ad14 (patch)
tree81998b73b21ad65a192b4f2081f87da5556b625a /tests
parent63570df75f82a309300182b5aca6491cfdca1bf8 (diff)
downloadnextcloud-server-bcb3d03f6cfc3e308c83280bee442f2b9060ad14.tar.gz
nextcloud-server-bcb3d03f6cfc3e308c83280bee442f2b9060ad14.zip
Fix windows tests skipping
* add call to setUp from inherited test class
Diffstat (limited to 'tests')
-rw-r--r--tests/lib/archive/tar.php9
1 files changed, 7 insertions, 2 deletions
diff --git a/tests/lib/archive/tar.php b/tests/lib/archive/tar.php
index e66a8740879..db98bb4e9c2 100644
--- a/tests/lib/archive/tar.php
+++ b/tests/lib/archive/tar.php
@@ -8,8 +8,14 @@
require_once 'archive.php';
-if (!OC_Util::runningOnWindows()) {
class Test_Archive_TAR extends Test_Archive {
+ public function setUp() {
+ if (OC_Util::runningOnWindows()) {
+ $this->markTestSkipped('tar archives are not supported on windows');
+ }
+ parent::setUp();
+ }
+
protected function getExisting() {
$dir = OC::$SERVERROOT . '/tests/data';
return new OC_Archive_TAR($dir . '/data.tar.gz');
@@ -19,4 +25,3 @@ class Test_Archive_TAR extends Test_Archive {
return new OC_Archive_TAR(OCP\Files::tmpFile('.tar.gz'));
}
}
-}