From e6f24bcdbe90ac05d9be9756afca10016511fbe2 Mon Sep 17 00:00:00 2001
From: Yaroslav Onischenko <yonischenko@magento.com>
Date: Wed, 21 Dec 2016 18:28:52 +0200
Subject: [PATCH] MAGETWO-62387: Travis Build Fail - 2.2.0
---
.../framework/Magento/TestFramework/Bootstrap/DocBlock.php | 2 ++
.../framework/Magento/TestFramework/ObjectManager.php | 2 --
.../integration/testsuite/Magento/Catalog/Helper/DataTest.php | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Bootstrap/DocBlock.php b/dev/tests/integration/framework/Magento/TestFramework/Bootstrap/DocBlock.php
index bf890b2448e..d23985bc38e 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Bootstrap/DocBlock.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Bootstrap/DocBlock.php
@@ -40,6 +40,7 @@ class DocBlock
*
* Note: order of registering (and applying) annotations is important.
* To allow config fixtures to deal with fixture stores, data fixtures should be processed first.
+ * ConfigFixture applied twice because data fixtures could clean config and clean custom settings
*
* @param \Magento\TestFramework\Application $application
* @return array
@@ -68,6 +69,7 @@ class DocBlock
new \Magento\TestFramework\Annotation\AppArea($application),
new \Magento\TestFramework\Annotation\Cache($application),
new \Magento\TestFramework\Annotation\AdminConfigFixture(),
+ new \Magento\TestFramework\Annotation\ConfigFixture(),
];
}
}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/ObjectManager.php b/dev/tests/integration/framework/Magento/TestFramework/ObjectManager.php
index ad685845cde..03fb9aa9dda 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/ObjectManager.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/ObjectManager.php
@@ -24,8 +24,6 @@ class ObjectManager extends \Magento\Framework\App\ObjectManager
* @var array
*/
protected $persistedInstances = [
- \Magento\TestFramework\App\Config::class,
- \Magento\Framework\App\Config\ScopeConfigInterface::class,
\Magento\Framework\App\ResourceConnection::class,
\Magento\Framework\Config\Scope::class,
\Magento\Framework\ObjectManager\RelationsInterface::class,
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Helper/DataTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Helper/DataTest.php
index 071c2499bb3..c2db58728d3 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Helper/DataTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Helper/DataTest.php
@@ -248,6 +248,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
* @magentoDataFixture Magento/Customer/_files/customer.php
* @magentoDataFixture Magento/Customer/_files/customer_address.php
* @magentoDbIsolation enabled
+ * @magentoAppIsolation enabled
* @dataProvider getTaxPriceDataProvider
*/
public function testGetTaxPrice(
--
GitLab