Skip to content

Commit 717ba2b

Browse files
author
Oleksii Korshenko
authored
Merge pull request #681 from magento-fearless-kiwis/MAGETWO-62388-travis-ci
Fixed issues: - MAGETWO-59680: Travis failure: imagettfbbox - MAGETWO-62388: Travis Build Fail
2 parents a21c443 + 318929d commit 717ba2b

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/Import/Product/Type/ConfigurableTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ class ConfigurableTest extends \PHPUnit_Framework_TestCase
5050
protected function setUp()
5151
{
5252
$this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
53+
\Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType::$commonAttributesCache = [];
5354
$this->model = $this->objectManager->create(\Magento\CatalogImportExport\Model\Import\Product::class);
5455
/** @var \Magento\Framework\EntityManager\MetadataPool $metadataPool */
5556
$metadataPool = $this->objectManager->get(\Magento\Framework\EntityManager\MetadataPool::class);

dev/tests/integration/testsuite/Magento/Framework/Image/Adapter/InterfaceTest.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -547,6 +547,10 @@ public function cropDataProvider()
547547
*/
548548
public function testCreatePngFromString($pixel1, $expectedColor1, $pixel2, $expectedColor2, $adapterType)
549549
{
550+
if (!function_exists('imagettfbbox')) {
551+
$this->markTestSkipped('Workaround of problem with imagettfbbox function on Travis');
552+
}
553+
550554
$adapter = $this->_getAdapter($adapterType);
551555

552556
/** @var \Magento\Framework\Filesystem\Directory\ReadFactory readFactory */

0 commit comments

Comments
 (0)