Skip some more tests on Windows which just can not work at all
This commit is contained in:
parent
a9c2e5a08e
commit
a3a064fe96
|
@ -134,6 +134,13 @@ class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase {
|
||||||
|
|
||||||
$handle = $view->fopen($filename, 'r');
|
$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
|
// set stream options
|
||||||
$this->assertTrue(stream_set_blocking($handle, 1));
|
$this->assertTrue(stream_set_blocking($handle, 1));
|
||||||
|
|
||||||
|
|
|
@ -30,6 +30,18 @@ class Test_Files_Sharing_Cache extends TestCase {
|
||||||
*/
|
*/
|
||||||
public $user2View;
|
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() {
|
function setUp() {
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
|
|
||||||
|
@ -54,7 +66,7 @@ class Test_Files_Sharing_Cache extends TestCase {
|
||||||
$this->view->file_put_contents('container/shareddir/subdir/another too.txt', $textData);
|
$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>');
|
$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->ownerCache = $this->ownerStorage->getCache();
|
||||||
$this->ownerStorage->getScanner()->scan('');
|
$this->ownerStorage->getScanner()->scan('');
|
||||||
|
|
||||||
|
@ -72,7 +84,7 @@ class Test_Files_Sharing_Cache extends TestCase {
|
||||||
|
|
||||||
// retrieve the shared storage
|
// retrieve the shared storage
|
||||||
$secondView = new \OC\Files\View('/' . self::TEST_FILES_SHARING_API_USER2);
|
$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();
|
$this->sharedCache = $this->sharedStorage->getCache();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -354,7 +366,7 @@ class Test_Files_Sharing_Cache extends TestCase {
|
||||||
self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
|
self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
|
||||||
\OC\Files\Filesystem::mkdir('foo');
|
\OC\Files\Filesystem::mkdir('foo');
|
||||||
\OC\Files\Filesystem::mkdir('foo/bar');
|
\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');
|
$folderInfo = \OC\Files\Filesystem::getFileInfo('foo');
|
||||||
$fileInfo = \OC\Files\Filesystem::getFileInfo('foo/bar/test.txt');
|
$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);
|
\OCP\Share::shareItem('folder', $folderInfo->getId(), \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER2, \OCP\PERMISSION_ALL);
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
class Test_Archive_TAR extends Test_Archive {
|
class Test_Archive_TAR extends Test_Archive {
|
||||||
public function setUp() {
|
public function setUp() {
|
||||||
if (OC_Util::runningOnWindows()) {
|
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();
|
parent::setUp();
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,7 +39,7 @@ class Local extends Storage {
|
||||||
|
|
||||||
public function testStableEtag() {
|
public function testStableEtag() {
|
||||||
if (\OC_Util::runningOnWindows()) {
|
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');
|
$this->instance->file_put_contents('test.txt', 'foobar');
|
||||||
|
@ -50,7 +50,7 @@ class Local extends Storage {
|
||||||
|
|
||||||
public function testEtagChange() {
|
public function testEtagChange() {
|
||||||
if (\OC_Util::runningOnWindows()) {
|
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');
|
$this->instance->file_put_contents('test.txt', 'foo');
|
||||||
|
|
|
@ -598,7 +598,7 @@ class View extends \PHPUnit_Framework_TestCase {
|
||||||
$folderName = 'abcdefghijklmnopqrstuvwxyz012345678901234567890123456789';
|
$folderName = 'abcdefghijklmnopqrstuvwxyz012345678901234567890123456789';
|
||||||
$tmpdirLength = strlen(\OC_Helper::tmpFolder());
|
$tmpdirLength = strlen(\OC_Helper::tmpFolder());
|
||||||
if (\OC_Util::runningOnWindows()) {
|
if (\OC_Util::runningOnWindows()) {
|
||||||
$this->markTestSkipped();
|
$this->markTestSkipped('[Windows] ');
|
||||||
$depth = ((260 - $tmpdirLength) / 57);
|
$depth = ((260 - $tmpdirLength) / 57);
|
||||||
}elseif(\OC_Util::runningOnMac()){
|
}elseif(\OC_Util::runningOnMac()){
|
||||||
$depth = ((1024 - $tmpdirLength) / 57);
|
$depth = ((1024 - $tmpdirLength) / 57);
|
||||||
|
|
|
@ -115,6 +115,10 @@ class Test_Helper extends PHPUnit_Framework_TestCase {
|
||||||
}
|
}
|
||||||
|
|
||||||
function testGetStringMimeType() {
|
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");
|
$result = OC_Helper::getStringMimeType("/data/data.tar.gz");
|
||||||
$expected = 'text/plain; charset=us-ascii';
|
$expected = 'text/plain; charset=us-ascii';
|
||||||
$this->assertEquals($result, $expected);
|
$this->assertEquals($result, $expected);
|
||||||
|
|
|
@ -62,14 +62,18 @@ class Test_Image extends PHPUnit_Framework_TestCase {
|
||||||
$img = new \OC_Image(OC::$SERVERROOT.'/tests/data/testimage.png');
|
$img = new \OC_Image(OC::$SERVERROOT.'/tests/data/testimage.png');
|
||||||
$this->assertEquals('image/png', $img->mimeType());
|
$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'));
|
$img = new \OC_Image(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.jpg'));
|
||||||
$this->assertEquals('image/jpeg', $img->mimeType());
|
$this->assertEquals('image/jpeg', $img->mimeType());
|
||||||
|
|
||||||
$img = new \OC_Image(base64_encode(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.gif')));
|
$img = new \OC_Image(base64_encode(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.gif')));
|
||||||
$this->assertEquals('image/gif', $img->mimeType());
|
$this->assertEquals('image/gif', $img->mimeType());
|
||||||
|
|
||||||
$img = new \OC_Image(null);
|
|
||||||
$this->assertEquals('', $img->mimeType());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testWidth() {
|
public function testWidth() {
|
||||||
|
|
Loading…
Reference in New Issue