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

5 files changed, 15 insertions, 7 deletions

diff --git a/tests/lib/archive/tar.php b/tests/lib/archive/tar.php
index 5b9089b32e1..99f7fb30e2b 100644
--- a/tests/lib/archive/tar.php
+++ b/tests/lib/archive/tar.php
@@ -9,7 +9,7 @@
 class Test_Archive_TAR extends Test_Archive {
 	public function setUp() {
 		if (OC_Util::runningOnWindows()) {
-			$this->markTestSkipped('tar archives are not supported on windows');
+			$this->markTestSkipped('[Windows] tar archives are not supported on Windows');
 		}
 		parent::setUp();
 	}
diff --git a/tests/lib/files/storage/local.php b/tests/lib/files/storage/local.php
index 37462941d0c..490086c62f2 100644
--- a/tests/lib/files/storage/local.php
+++ b/tests/lib/files/storage/local.php
@@ -39,7 +39,7 @@ class Local extends Storage {
 
 	public function testStableEtag() {
 		if (\OC_Util::runningOnWindows()) {
-			$this->markTestSkipped('On Windows platform we have no stable etag generation - yet');
+			$this->markTestSkipped('[Windows] On Windows platform we have no stable etag generation - yet');
 		}
 
 		$this->instance->file_put_contents('test.txt', 'foobar');
@@ -50,7 +50,7 @@ class Local extends Storage {
 
 	public function testEtagChange() {
 		if (\OC_Util::runningOnWindows()) {
-			$this->markTestSkipped('On Windows platform we have no stable etag generation - yet');
+			$this->markTestSkipped('[Windows] On Windows platform we have no stable etag generation - yet');
 		}
 
 		$this->instance->file_put_contents('test.txt', 'foo');
diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php
index 5f030f29fa7..931f5acd95a 100644
--- a/tests/lib/files/view.php
+++ b/tests/lib/files/view.php
@@ -598,7 +598,7 @@ class View extends \PHPUnit_Framework_TestCase {
 		$folderName = 'abcdefghijklmnopqrstuvwxyz012345678901234567890123456789';
 		$tmpdirLength = strlen(\OC_Helper::tmpFolder());
 		if (\OC_Util::runningOnWindows()) {
-			$this->markTestSkipped();
+			$this->markTestSkipped('[Windows] ');
 			$depth = ((260 - $tmpdirLength) / 57);
 		}elseif(\OC_Util::runningOnMac()){
 			$depth = ((1024 - $tmpdirLength) / 57);
diff --git a/tests/lib/helper.php b/tests/lib/helper.php
index 520a3e0e669..57c72c11987 100644
--- 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 795bc464159..a683c3d2c8b 100644
--- 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() {