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

Author: oshmyheliuk

app/code/Magento/RemoteStorage/Plugin/Image.php

@@ -167,8 +167,9 @@ public function aroundSave(
     public function __destruct()
     {
         try {
-            foreach ($this->tmpFiles as $tmpFile) {
+            foreach ($this->tmpFiles as $key => $tmpFile) {
                 $this->tmpDirectoryWrite->delete($tmpFile);
+                unset($this->tmpFiles[$key]);
             }
         } catch (\Exception $e) {
             $this->logger->error($e->getMessage());
@@ -192,7 +193,7 @@ private function copyFileToTmp(string $filePath): string
             $this->tmpDirectoryWrite->create();
             $tmpPath = $this->storeTmpName($filePath);
             $content = $this->remoteDirectoryWrite->getDriver()->fileGetContents($filePath);
-            $filePath = $this->tmpDirectoryWrite->getDriver()->filePutContents($tmpPath, $content)
+            $filePath = $this->tmpDirectoryWrite->getDriver()->filePutContents($tmpPath, $content) >= 0
                 ? $tmpPath
                 : $filePath;
         }

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

@@ -21,6 +21,7 @@
 use Magento\ImportExport\Model\Import;
 use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
 use Magento\ImportExport\Model\Import\Source\Csv;
+use Magento\RemoteStorage\Plugin\Image;
 use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\TestFramework\Indexer\TestCase;
@@ -109,6 +110,9 @@ protected function tearDown(): void
                 // nothing to delete
             }
         }
+        // Removing cached images from previous tests in cases when Remote storage is configured
+        $image = $this->objectManager->get(Image::class);
+        $image->__destruct();
     }