Merge pull request #33771 from andrewbess/bugfix/fixes-for-failed-integration-tests

Fixed flaky integration tests

Author: andrewbess

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/AbstractProductExportImportTestCase.php

@@ -124,10 +124,31 @@ public function testImportExport(array $fixtures, array $skus, array $skippedAtt
         $csvFile = $this->executeExportTest($skus, $skippedAttributes);
 
         $this->executeImportReplaceTest($skus, $skippedAttributes, false, $csvFile);
-        $this->executeImportReplaceTest($skus, $skippedAttributes, true, $csvFile);
         $this->executeImportDeleteTest($skus, $csvFile);
     }
 
+    /**
+     * Run import/export test with pagination.
+     *
+     * @magentoAppArea adminhtml
+     * @magentoDbIsolation disabled
+     * @magentoAppIsolation enabled
+     *
+     * @param array $fixtures
+     * @param string[] $skus
+     * @param string[] $skippedAttributes
+     * @dataProvider exportImportDataProvider
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function testImportExportWithPagination(array $fixtures, array $skus, array $skippedAttributes = [])
+    {
+        $this->fixtures = $fixtures;
+        $this->executeFixtures($fixtures);
+        $this->modifyData($skus);
+        $skippedAttributes = array_merge(self::$skippedAttributes, $skippedAttributes);
+        $this->executeImportReplaceTest($skus, $skippedAttributes, true);
+    }
+
     /**
      * Provide data for import/export.
      *

dev/tests/integration/testsuite/Magento/DownloadableImportExport/Model/DownloadableTest.php

@@ -49,6 +49,25 @@ public function testImportExport(array $fixtures, array $skus, array $skippedAtt
         parent::testImportExport($fixtures, $skus, $skippedAttributes);
     }
 
+    /**
+     * Run import/export test with pagination.
+     *
+     * @magentoAppArea adminhtml
+     * @magentoDbIsolation disabled
+     * @magentoAppIsolation enabled
+     *
+     * @param array $fixtures
+     * @param string[] $skus
+     * @param string[] $skippedAttributes
+     * @dataProvider exportImportDataProvider
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function testImportExportWithPagination(array $fixtures, array $skus, array $skippedAttributes = [])
+    {
+        $skippedAttributes = array_merge(self::$skippedAttributes, ['downloadable_links']);
+        parent::testImportExportWithPagination($fixtures, $skus, $skippedAttributes);
+    }
+
     /**
      * @inheritdoc
      */