Merge remote-tracking branch 'origin/2.2.6-develop' into 2.2.6-develop-pr41

Author: zakdma

dev/tests/integration/testsuite/Magento/Catalog/Pricing/Render/FinalPriceBoxTest.php

@@ -125,7 +125,7 @@ protected function setUp()
 
     /**
      * @magentoDataFixture Magento/Catalog/_files/product_has_tier_price_show_as_low_as.php
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
      */
     public function testRenderAmountMinimalProductWithTierPricesShouldShowMinTierPrice()
@@ -136,7 +136,7 @@ public function testRenderAmountMinimalProductWithTierPricesShouldShowMinTierPri
 
     /**
      * @magentoDataFixture Magento/Catalog/_files/product_different_store_prices.php
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
      * @magentoConfigFixture current_store catalog/frontend/flat_catalog_product 1
      */

dev/tests/integration/testsuite/Magento/Quote/Model/QuoteValidatorTest.php

@@ -12,6 +12,9 @@
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\ObjectManager;
 
+/**
+ * @magentoDbIsolation disabled
+ */
 class QuoteValidatorTest extends \PHPUnit\Framework\TestCase
 {
     /**

dev/tests/integration/testsuite/Magento/Sales/Model/Order/Address/RendererTest.php

@@ -46,7 +46,7 @@ protected function setUp()
 
     /**
      * @magentoDataFixture Magento/Sales/_files/order_fixture_store.php
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
      */
     public function testFormat()

dev/tests/integration/testsuite/Magento/Store/_files/websites_different_countries_rollback.php

@@ -13,18 +13,18 @@
 use Magento\Framework\App\Config\ReinitableConfigInterface;
 
 $objectManager = Bootstrap::getObjectManager();
-//Deleting second website's store.
-$store = $objectManager->create(Store::class);
-if ($store->load('fixture_second_store', 'code')->getId()) {
-    $store->delete();
-}
 
-//Deleting the second website.
 /** @var Registry $registry */
 $registry = $objectManager->get(Registry::class);
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', true);
 
+//Deleting second website's store.
+$store = $objectManager->create(Store::class);
+if ($store->load('fixture_second_store', 'code')->getId()) {
+    $store->delete();
+}
+
 $configResource = $objectManager->get(\Magento\Config\Model\ResourceModel\Config::class);
 //Restoring allowed countries.
 $configResource->deleteConfig(