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

Author: oshmyheliuk

app/code/Magento/ImportExport/Model/Import/Source/Csv.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\ImportExport\Model\Import\Source;
 
+use Magento\Framework\Filesystem\Directory\Read;
+
 /**
  * CSV import adapter
  */
@@ -27,26 +29,39 @@ class Csv extends \Magento\ImportExport\Model\Import\AbstractSource
      */
     protected $_enclosure = '';
 
+    /**
+     * @var string
+     */
+    private string $filePath;
+
+    /**
+     * @var array
+     */
+    private static array $openFiles;
+
     /**
      * Open file and detect column names
      *
      * There must be column names in the first line
      *
      * @param string $file
-     * @param \Magento\Framework\Filesystem\Directory\Read $directory
+     * @param Read $directory
      * @param string $delimiter
      * @param string $enclosure
      * @throws \LogicException
      */
     public function __construct(
         $file,
-        \Magento\Framework\Filesystem\Directory\Read $directory,
+        Read $directory,
         $delimiter = ',',
         $enclosure = '"'
     ) {
         register_shutdown_function([$this, 'destruct']);
         try {
-            $this->_file = $directory->openFile($directory->getRelativePath($file), 'r');
+            $this->filePath = $directory->getRelativePath($file);
+            $this->_file = $directory->openFile($this->filePath, 'r');
+            $this->_file->seek(0);
+            self::$openFiles[$this->filePath] = true;
         } catch (\Magento\Framework\Exception\FileSystemException $e) {
             throw new \LogicException("Unable to open file: '{$file}'");
         }
@@ -64,8 +79,9 @@ public function __construct(
      */
     public function destruct()
     {
-        if (is_object($this->_file)) {
+        if (is_object($this->_file) && !empty(self::$openFiles[$this->filePath])) {
             $this->_file->close();
+            unset(self::$openFiles[$this->filePath]);
         }
     }
 

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

@@ -412,14 +412,16 @@ 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]
+            ['fileSystem' => $this->fileSystem]
         );
         $exportProduct->setWriter($writer);
-        $this->assertNotEmpty($exportProduct->export());
+        $content = $exportProduct->export();
+        $this->assertNotEmpty($content);
+
+        $directory = $this->fileSystem->getDirectoryWrite(DirectoryList::VAR_IMPORT_EXPORT);
+        $directory->getDriver()->filePutContents($directory->getAbsolutePath($csvfile), $content);
 
         return $csvfile;
     }