Browse Source
Merge pull request #24614 from nextcloud/bugfix/noid/fix-imagick-tests
Skip the test if Imagick is misconfigured
pull/24630/head
Julius Härtl
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
4 additions and
0 deletions
-
tests/lib/Preview/Provider.php
|
|
@ -141,6 +141,10 @@ abstract class Provider extends \Test\TestCase { |
|
|
$file = new File(\OC::$server->getRootFolder(), $this->rootView, $this->imgPath); |
|
|
$file = new File(\OC::$server->getRootFolder(), $this->rootView, $this->imgPath); |
|
|
$preview = $provider->getThumbnail($file, $this->maxWidth, $this->maxHeight, $this->scalingUp); |
|
|
$preview = $provider->getThumbnail($file, $this->maxWidth, $this->maxHeight, $this->scalingUp); |
|
|
|
|
|
|
|
|
|
|
|
if (get_class($this) === BitmapTest::class && $preview === null) { |
|
|
|
|
|
$this->markTestSkipped('An error occured while operating with Imagick.'); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
$this->assertNotEquals(false, $preview); |
|
|
$this->assertNotEquals(false, $preview); |
|
|
$this->assertEquals(true, $preview->valid()); |
|
|
$this->assertEquals(true, $preview->valid()); |
|
|
|
|
|
|
|
|
|
