diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2014-08-21 10:07:05 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2014-08-21 10:07:05 +0200 |
| commit | 691db8e26ed067aa1ba848adb6b4039b7c32dc40 (patch) | |
| tree | 81998b73b21ad65a192b4f2081f87da5556b625a /tests | |
| parent | 952fac849316d25b14c8247c7faad4b91b4737f3 (diff) | |
| parent | bcb3d03f6cfc3e308c83280bee442f2b9060ad14 (diff) | |
| download | nextcloud-server-691db8e26ed067aa1ba848adb6b4039b7c32dc40.tar.gz nextcloud-server-691db8e26ed067aa1ba848adb6b4039b7c32dc40.zip | |
Merge pull request #10458 from owncloud/fix-tar-tests
temporarily disable TAR tests on travis
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lib/archive/tar.php | 9 |
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')); } } -} |