MC-31042: MFTF automated test is flaky when importing CSV

Author: viktorpetryk

app/code/Magento/ImportExport/Test/Mftf/Test/AdminCheckDoubleImportOfProductsTest.xml

@@ -18,13 +18,16 @@
 use Magento\CatalogInventory\Model\Stock;
 use Magento\CatalogInventory\Model\StockRegistry;
 use Magento\CatalogInventory\Model\StockRegistryStorage;
+use Magento\Framework\Api\SearchCriteria;
+use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\App\Bootstrap;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DataObject;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Registry;
+use Magento\ImportExport\Helper\Data;
 use Magento\ImportExport\Model\Import;
 use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
 use Magento\ImportExport\Model\Import\Source\Csv;
@@ -79,6 +82,11 @@ class ProductTest extends \Magento\TestFramework\Indexer\TestCase
      */
     private $logger;
 
+    /**
+     * @var SearchCriteriaBuilder
+     */
+    private $searchCriteriaBuilder;
+
     /**
      * @var ProductRepositoryInterface
      */
@@ -98,6 +106,7 @@ protected function setUp()
             ['logger' => $this->logger]
         );
         $this->importedProducts = [];
+        $this->searchCriteriaBuilder = $this->objectManager->get(SearchCriteriaBuilder::class);
         $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
 
         parent::setUp();
@@ -2680,35 +2689,46 @@ public function testImportWithBackordersDisabled(): void
     }
 
     /**
-     * Import file by providing import filename in parameters.
+     * Import file by providing import filename and bunch size.
      *
      * @param string $fileName
-     * @return void
+     * @param int $bunchSize
+     * @return bool
      */
-    private function importFile(string $fileName): void
+    private function importFile(string $fileName, int $bunchSize = 100): bool
     {
-        $filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
+        $importExportData = $this->getMockBuilder(Data::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $importExportData->expects($this->atLeastOnce())
+            ->method('getBunchSize')
+            ->willReturn($bunchSize);
+        $this->_model = $this->objectManager->create(
+            ImportProduct::class,
+            ['importExportData' => $importExportData]
+        );
+        $filesystem = $this->objectManager->create(Filesystem::class);
         $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
         $source = $this->objectManager->create(
-            \Magento\ImportExport\Model\Import\Source\Csv::class,
+            Csv::class,
             [
-                'file' => __DIR__ . '/_files/' . $fileName,
+                'file' => __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . $fileName,
                 'directory' => $directory,
             ]
         );
         $errors = $this->_model->setParameters(
             [
-                'behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND,
+                'behavior' => Import::BEHAVIOR_APPEND,
                 'entity' => 'catalog_product',
-                \Magento\ImportExport\Model\Import::FIELDS_ENCLOSURE => 1,
+                Import::FIELDS_ENCLOSURE => 1,
             ]
         )
-        ->setSource($source)
-        ->validateData();
+            ->setSource($source)
+            ->validateData();
 
-        $this->assertTrue($errors->getErrorsCount() == 0);
+        $this->assertTrue($errors->getErrorsCount() === 0);
 
-        $this->_model->importData();
+        return $this->_model->importData();
     }
 
     /**
@@ -3050,4 +3070,33 @@ public function testEmptyAttributeValueShouldBeIgnoredAfterUpdateProductByImport
         $this->assertEquals('Varchar default value', $simpleProduct->getData('varchar_attribute'));
         $this->assertEquals('Short description', $simpleProduct->getData('short_description'));
     }
+
+    /**
+     * Checks possibility to double importing products using the same import file.
+     *
+     * Bunch size is using to test importing the same product that will be chunk to different bunches.
+     * Example:
+     * - first bunch
+     * product-sku,default-store
+     * product-sku,second-store
+     * - second bunch
+     * product-sku,third-store
+     *
+     * @magentoDbIsolation disabled
+     * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
+     * @magentoDataFixture Magento/Store/_files/second_store.php
+     */
+    public function testCheckDoubleImportOfProducts()
+    {
+        /** @var SearchCriteria $searchCriteria */
+        $searchCriteria = $this->searchCriteriaBuilder->create();
+
+        $this->assertEquals(true, $this->importFile('products_with_two_store_views.csv', 2));
+        $productsAfterFirstImport = $this->productRepository->getList($searchCriteria)->getItems();
+        $this->assertEquals(3, count($productsAfterFirstImport));
+
+        $this->assertEquals(true, $this->importFile('products_with_two_store_views.csv', 2));
+        $productsAfterSecondImport = $this->productRepository->getList($searchCriteria)->getItems();
+        $this->assertEquals(3, count($productsAfterSecondImport));
+    }
 }

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php

@@ -0,0 +1,10 @@
+sku,name,store_view_code,product_type,attribute_set_code,price,custom_options
+simple1,Simple 1,,simple,Default,100,"name=Test Option 1,type=field"
+simple1,Simple 1,fixturestore,simple,Default,,"name=Test Option 1,type=field"
+simple1,Simple 1,fixture_second_store,simple,Default,,"name=Test Option 1,type=field"
+simple2,Simple 2,,simple,Default,200,"name=Test Option 1,type=field"
+simple2,Simple 2,fixturestore,simple,Default,,"name=Test Option 1,type=field"
+simple2,Simple 2,fixture_second_store,simple,Default,,"name=Test Option 1,type=field"
+simple3,Simple 3,,simple,Default,300,"name=Test Option 1,type=field"
+simple3,Simple 3,fixturestore,simple,Default,,"name=Test Option 1,type=field"
+simple3,Simple 3,fixture_second_store,simple,Default,,"name=Test Option 1,type=field"