ACPT-1572: Slow saving of stores/websites

- Fix integration tests;

Author: adifucan

dev/tests/integration/testsuite/Magento/Customer/Ui/Component/Listing/AttributeRepositoryTest.php

@@ -7,9 +7,8 @@
 
 namespace Magento\Customer\Ui\Component\Listing;
 
-use Magento\Framework\App\Cache\Manager;
 use Magento\TestFramework\Helper\Bootstrap;
-use Magento\TestFramework\ObjectManager;
+use Magento\TestFramework\Helper\CacheCleaner;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -24,18 +23,12 @@ class AttributeRepositoryTest extends TestCase
      */
     private $model;
 
-    /**
-     * @var ObjectManager
-     */
-    private $objectManager;
-
     /**
      * @inheritdoc
      */
     protected function setUp(): void
     {
-        $this->objectManager = Bootstrap::getObjectManager();
-        $this->model = $this->objectManager->create(AttributeRepository::class);
+        $this->model = Bootstrap::getObjectManager()->create(AttributeRepository::class);
     }
 
     /**
@@ -46,9 +39,7 @@ protected function setUp(): void
      */
     public function testGetOptionArray(): void
     {
-        $cache = $this->objectManager->get(Manager::class);
-        $cache->clean(['full_page', 'config']);
-
+        CacheCleaner::cleanAll();
         $result = $this->model->getMetadataByCode('store_id');
 
         $this->assertTrue(isset($result['options']['1']['value']));

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

@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-use Magento\Framework\App\Cache\Manager;
+use Magento\TestFramework\Helper\CacheCleaner;
 
 $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 $website = $objectManager->create(\Magento\Store\Model\Website::class);
@@ -61,5 +61,4 @@
 $indexerRegistry = $objectManager->create(\Magento\Framework\Indexer\IndexerRegistry::class);
 $indexerRegistry->get(\Magento\CatalogSearch\Model\Indexer\Fulltext::INDEXER_ID)->reindexAll();
 
-$cache = $objectManager->get(Manager::class);
-$cache->clean(['full_page', 'config']);
+CacheCleaner::cleanAll();