From bcb3d03f6cfc3e308c83280bee442f2b9060ad14 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Sat, 16 Aug 2014 10:26:26 +0200 Subject: [PATCH] Fix windows tests skipping * add call to setUp from inherited test class --- tests/lib/archive/tar.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/lib/archive/tar.php b/tests/lib/archive/tar.php index e66a874087..db98bb4e9c 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')); } } -}