ENGCOM-7616: Product CSV import error report file missing #28460

Author: slavvka

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

@@ -54,6 +54,19 @@ public function destruct()
     {
         if (is_object($this->_fileHandler)) {
             $this->_fileHandler->close();
+            $this->resolveDestination();
+        }
+    }
+
+    /**
+     * Remove temporary destination
+     *
+     * @return void
+     */
+    private function resolveDestination(): void
+    {
+        // only temporary file located directly in var folder
+        if (strpos($this->_destination, '/') === false) {
             $this->_directoryHandle->delete($this->_destination);
         }
     }

dev/tests/integration/testsuite/Magento/ImportExport/Model/Export/Adapter/CsvTest.php

@@ -9,6 +9,7 @@
 
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Filesystem;
+use Magento\ImportExport\Model\Import;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
@@ -28,43 +29,53 @@ class CsvTest extends TestCase
      */
     private $objectManager;
 
-    /**
-     * @var Csv
-     */
-    private $csv;
-
     /**
      * @inheritdoc
      */
     protected function setUp(): void
     {
-        parent::setUp();
-
         $this->objectManager = Bootstrap::getObjectManager();
-        $this->csv = $this->objectManager->create(
-            Csv::class,
-            ['destination' => $this->destination]
-        );
     }
 
     /**
      * Test to destruct export adapter
+     *
+     * @dataProvider destructDataProvider
+     *
+     * @param string $destination
+     * @param bool $shouldBeDeleted
+     * @return void
      */
-    public function testDestruct(): void
+    public function testDestruct(string $destination, bool $shouldBeDeleted): void
     {
+        $csv = $this->objectManager->create(Csv::class, ['destination' => $destination]);
         /** @var Filesystem $fileSystem */
         $fileSystem = $this->objectManager->get(Filesystem::class);
         $directoryHandle = $fileSystem->getDirectoryRead(DirectoryList::VAR_DIR);
         /** Assert that the destination file is present after construct */
         $this->assertFileExists(
-            $directoryHandle->getAbsolutePath($this->destination),
+            $directoryHandle->getAbsolutePath($destination),
             'The destination file was\'t created after construct'
         );
-        /** Assert that the destination file was removed after destruct */
-        $this->csv = null;
-        $this->assertFileNotExists(
-            $directoryHandle->getAbsolutePath($this->destination),
-            'The destination file was\'t removed after destruct'
-        );
+        unset($csv);
+
+        if ($shouldBeDeleted) {
+            $this->assertFileDoesNotExist($directoryHandle->getAbsolutePath($destination));
+        } else {
+            $this->assertFileExists($directoryHandle->getAbsolutePath($destination));
+        }
+    }
+
+    /**
+     * DataProvider for testDestruct
+     *
+     * @return array
+     */
+    public function destructDataProvider(): array
+    {
+        return [
+            'temporary file' => [$this->destination, true],
+            'import history file' => [Import::IMPORT_HISTORY_DIR . $this->destination, false],
+        ];
     }
 }