B2B-2023: [AWS S3] [Integration Tests]: Investigate Test Failures in CatalogImportExport module

Author: oshmyheliuk

app/code/Magento/ImportExport/Model/Export/Adapter/Csv.php

@@ -72,14 +72,6 @@ private function resolveDestination(): void
         }
     }
 
-    /**
-     * @return Write
-     */
-    public function getFileHandler(): Write
-    {
-        return $this->_fileHandler;
-    }
-
     /**
      * Method called as last step of object instance creation. Can be overridden in child classes.
      *

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

@@ -412,13 +412,14 @@ private function exportProducts(Product $exportProduct = null)
         $exportProduct = $exportProduct ?: $this->objectManager->create(
             Product::class
         );
+        $directory = $this->fileSystem->getDirectoryWrite(DirectoryList::VAR_IMPORT_EXPORT);
+        $directory->touch($csvfile);
         $writer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
             \Magento\ImportExport\Model\Export\Adapter\Csv::class,
             ['fileSystem' => $this->fileSystem, 'destination' => $csvfile]
         );
         $exportProduct->setWriter($writer);
         $this->assertNotEmpty($exportProduct->export());
-        $writer->getFileHandler()->close();
 
         return $csvfile;
     }

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

@@ -273,25 +273,16 @@ protected function csvToArray($content, $entityId = null)
      */
     protected function importDataForMediaTest(string $fileName, int $expectedErrors = 0)
     {
-        $rootDirectory = $this->objectManager->get(TargetDirectory::class)->getDirectoryWrite(DirectoryList::ROOT);
         $filesystem = $this->objectManager->get(Filesystem::class);
-        $importExportDirectory = $filesystem->getDirectoryWrite(DirectoryList::VAR_IMPORT_EXPORT);
-
-        $dirPath = $importExportDirectory->getAbsolutePath('import');
-        $driver = $importExportDirectory->getDriver();
-        $driver->createDirectory($dirPath);
-        $driver->filePutContents(
-            $dirPath . DIRECTORY_SEPARATOR . $fileName,
-            file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . $fileName)
-        );
-
+        $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
         $source = $this->objectManager->create(
             \Magento\ImportExport\Model\Import\Source\Csv::class,
             [
-                'file' => $dirPath . DIRECTORY_SEPARATOR . $fileName,
-                'directory' => $importExportDirectory
+                'file' => __DIR__ . '/_files/' . $fileName,
+                'directory' => $directory
             ]
         );
+        $rootDirectory = $this->objectManager->get(TargetDirectory::class)->getDirectoryWrite(DirectoryList::ROOT);
         $this->_model->setParameters(
             [
                 'behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND,
@@ -341,7 +332,6 @@ function ($output, $error) {
                 ''
             )
         );
-        $source->destruct();
     }
 
     /**
@@ -387,38 +377,30 @@ protected function importFile(string $fileName, int $bunchSize = 100): bool
             ['importExportData' => $importExportData]
         );
         $filesystem = $this->objectManager->create(Filesystem::class);
-        $directory = $filesystem->getDirectoryWrite(DirectoryList::VAR_IMPORT_EXPORT);
-
-        $dirPath = $directory->getAbsolutePath('import');
-        $driver = $directory->getDriver();
-        $driver->createDirectory($dirPath);
-        $driver->filePutContents(
-            $dirPath . DIRECTORY_SEPARATOR . $fileName,
-            file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . $fileName)
-        );
+        $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
         $source = $this->objectManager->create(
             Csv::class,
             [
-                'file' => $dirPath . DIRECTORY_SEPARATOR . $fileName,
+                'file' => __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . $fileName,
                 'directory' => $directory,
             ]
         );
+        $mediaDirectory = $filesystem->getDirectoryWrite(DirectoryList::MEDIA);
+        $mediaDirectory->create('import');
         $errors = $this->_model->setParameters(
             [
                 'behavior' => Import::BEHAVIOR_APPEND,
                 'entity' => 'catalog_product',
                 Import::FIELDS_ENCLOSURE => 1,
-                Import::FIELD_NAME_IMG_FILE_DIR => $this->getMediaDirPath($directory) . '/import'
+                Import::FIELD_NAME_IMG_FILE_DIR => $this->getMediaDirPath($mediaDirectory) . '/import'
             ]
         )
             ->setSource($source)
             ->validateData();
 
         $this->assertTrue($errors->getErrorsCount() === 0);
 
-        $result = $this->_model->importData();
-        $source->destruct();
-        return $result;
+        return $this->_model->importData();
     }
 
     /**