Merge remote-tracking branch 'origin/AC-1657' into GL_Mainline_PR_25112021

Author: glo71317

dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_rollback.php

@@ -6,11 +6,14 @@
 declare(strict_types=1);
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\CatalogInventory\Model\Indexer\Stock\Processor;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\StateException;
+use Magento\Framework\Registry;
 use Magento\TestFramework\Helper\Bootstrap;
 
-$registry = Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+$registry = Bootstrap::getObjectManager()->get(Registry::class);
 
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', true);
@@ -26,5 +29,7 @@
 } catch (StateException $exception) {
 }
 
+ObjectManager::getInstance()->create(Processor::class)->reindexAll();
+
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', false);

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

@@ -116,8 +116,8 @@ protected function tearDown(): void
     }
 
     /**
-     * @magentoDataFixture Magento/Catalog/_files/product_virtual.php
      * @magentoDataFixture Magento/Sales/_files/quote.php
+     * @magentoDataFixture Magento/Catalog/_files/product_virtual.php
      * @return void
      */
     public function testCollectTotalsWithVirtual(): void