Skip some more tests on Windows which just can not work at all

Conflicts:
	tests/lib/archive/tar.php
	tests/lib/files/storage/local.php
	tests/lib/files/view.php

diff --git a/apps/files_encryption/tests/stream.php b/apps/files_encryption/tests/stream.php
index b8c18fbe0490ff9263c8acb287d03734b1f4097f..f871b3b4c6116e6d5f2e02dc319d58c4d75c326c 100644 (file)
--- a/apps/files_encryption/tests/stream.php
+++ b/apps/files_encryption/tests/stream.php
@@ -141,6 +141,13 @@ class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase {
 
                $handle = $view->fopen($filename, 'r');
 
+
+               if (\OC_Util::runningOnWindows()) {
+                       fclose($handle);
+                       $view->unlink($filename);
+                       $this->markTestSkipped('[Windows] stream_set_blocking() does not work as expected on Windows.');
+               }
+
                // set stream options
                $this->assertTrue(stream_set_blocking($handle, 1));
 

diff --git a/apps/files_sharing/tests/cache.php b/apps/files_sharing/tests/cache.php
index 1b0fe6fdc6d3c45ae8eee344ee11aa90761c51f2..042722206188b3e3e07a8aa1ae98a63944e290ee 100644 (file)
--- a/apps/files_sharing/tests/cache.php
+++ b/apps/files_sharing/tests/cache.php
@@ -29,6 +29,18 @@ class Test_Files_Sharing_Cache extends Test_Files_Sharing_Base {
         */
        public $user2View;
 
+       /** @var \OC\Files\Cache\Cache */
+       protected $ownerCache;
+
+       /** @var \OC\Files\Cache\Cache */
+       protected $sharedCache;
+
+       /** @var \OC\Files\Storage\Storage */
+       protected $ownerStorage;
+
+       /** @var \OC\Files\Storage\Storage */
+       protected $sharedStorage;
+
        function setUp() {
                parent::setUp();
 
@@ -53,7 +65,7 @@ class Test_Files_Sharing_Cache extends Test_Files_Sharing_Base {
                $this->view->file_put_contents('container/shareddir/subdir/another too.txt', $textData);
                $this->view->file_put_contents('container/shareddir/subdir/not a text file.xml', '<xml></xml>');
 
-               list($this->ownerStorage, $internalPath) = $this->view->resolvePath('');
+               list($this->ownerStorage,) = $this->view->resolvePath('');
                $this->ownerCache = $this->ownerStorage->getCache();
                $this->ownerStorage->getScanner()->scan('');
 
@@ -71,7 +83,7 @@ class Test_Files_Sharing_Cache extends Test_Files_Sharing_Base {
 
                // retrieve the shared storage
                $secondView = new \OC\Files\View('/' . self::TEST_FILES_SHARING_API_USER2);
-               list($this->sharedStorage, $internalPath) = $secondView->resolvePath('files/shareddir');
+               list($this->sharedStorage,) = $secondView->resolvePath('files/shareddir');
                $this->sharedCache = $this->sharedStorage->getCache();
        }
 
@@ -353,7 +365,7 @@ class Test_Files_Sharing_Cache extends Test_Files_Sharing_Base {
                self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
                \OC\Files\Filesystem::mkdir('foo');
                \OC\Files\Filesystem::mkdir('foo/bar');
-               \OC\Files\Filesystem::touch('foo/bar/test.txt', 'bar');
+               \OC\Files\Filesystem::touch('foo/bar/test.txt');
                $folderInfo = \OC\Files\Filesystem::getFileInfo('foo');
                $fileInfo = \OC\Files\Filesystem::getFileInfo('foo/bar/test.txt');
                \OCP\Share::shareItem('folder', $folderInfo->getId(), \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER2, \OCP\PERMISSION_ALL);

diff --git a/tests/lib/archive/tar.php b/tests/lib/archive/tar.php
index d831487b16fae3e83e1992717a7687a7d040ba28..2b5271edd5286311ff52e520adb37366e7342b0b 100644 (file)
--- a/tests/lib/archive/tar.php
+++ b/tests/lib/archive/tar.php
@@ -8,12 +8,16 @@
 
 require_once 'archive.php';
 
-if (!OC_Util::runningOnWindows()) {
 class Test_Archive_TAR extends Test_Archive {
        public function setUp() {
-               if (floatval(phpversion())>=5.5) {
+               parent::setUp();
+
+               if (floatval(phpversion()) >= 5.5) {
                        $this->markTestSkipped('php 5.5 changed unpack function.');
-                       return;
+               }
+
+               if (OC_Util::runningOnWindows()) {
+                       $this->markTestSkipped('[Windows] tar archives are not supported on Windows');
                }
        }
        protected function getExisting() {
@@ -25,4 +29,3 @@ class Test_Archive_TAR extends Test_Archive {
                return new OC_Archive_TAR(OCP\Files::tmpFile('.tar.gz'));
        }
 }
-}

diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php
index 522535946a536ff25417e2c7f89d71b5bc53d927..c0bac55ca809e0d286c7e701ce8056a86819caeb 100644 (file)
--- a/tests/lib/files/view.php
+++ b/tests/lib/files/view.php
@@ -590,7 +590,17 @@ class View extends \PHPUnit_Framework_TestCase {
                $longPath = '';
                // 4000 is the maximum path length in file_cache.path
                $folderName = 'abcdefghijklmnopqrstuvwxyz012345678901234567890123456789';
-               $depth = (4000 / 57);
+
+               $tmpdirLength = strlen(\OC_Helper::tmpFolder());
+               if (\OC_Util::runningOnWindows()) {
+                       $this->markTestSkipped('[Windows] ');
+                       $depth = ((260 - $tmpdirLength) / 57);
+               } elseif (\OC_Util::runningOnMac()){
+                       $depth = ((1024 - $tmpdirLength) / 57);
+               } else {
+                       $depth = ((4000 - $tmpdirLength) / 57);
+               }
+
                foreach (range(0, $depth - 1) as $i) {
                        $longPath .= '/' . $folderName;
                        $result = $rootView->mkdir($longPath);

diff --git a/tests/lib/helper.php b/tests/lib/helper.php
index 6146b29b437de6da360f755241dbf666f16e80ac..de625d144cecd8e4c212542fb60bf13987347fec 100644 (file)
--- a/tests/lib/helper.php
+++ b/tests/lib/helper.php
@@ -115,6 +115,10 @@ class Test_Helper extends PHPUnit_Framework_TestCase {
        }
 
        function testGetStringMimeType() {
+               if (\OC_Util::runningOnWindows()) {
+                       $this->markTestSkipped('[Windows] Strings have mimetype application/octet-stream on Windows');
+               }
+
                $result = OC_Helper::getStringMimeType("/data/data.tar.gz");
                $expected = 'text/plain; charset=us-ascii';
                $this->assertEquals($result, $expected);

diff --git a/tests/lib/image.php b/tests/lib/image.php
index 795bc4641595be562a04f4768c2e9a19e9c688e2..a683c3d2c8b674b66f93dd639249fe1248adb310 100644 (file)
--- a/tests/lib/image.php
+++ b/tests/lib/image.php
@@ -62,14 +62,18 @@ class Test_Image extends PHPUnit_Framework_TestCase {
                $img = new \OC_Image(OC::$SERVERROOT.'/tests/data/testimage.png');
                $this->assertEquals('image/png', $img->mimeType());
 
+               $img = new \OC_Image(null);
+               $this->assertEquals('', $img->mimeType());
+
+               if (\OC_Util::runningOnWindows()) {
+                       $this->markTestSkipped('[Windows] Images created with imagecreate() are pngs on windows');
+               }
+
                $img = new \OC_Image(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.jpg'));
                $this->assertEquals('image/jpeg', $img->mimeType());
 
                $img = new \OC_Image(base64_encode(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.gif')));
                $this->assertEquals('image/gif', $img->mimeType());
-
-               $img = new \OC_Image(null);
-               $this->assertEquals('', $img->mimeType());
        }
 
        public function testWidth() {