B2B-2017: [AWS S3] [Integration Tests]: Investigate Test Failures in ImportExport module

Author: oshmyheliuk

app/code/Magento/ImportExport/Controller/Adminhtml/Export/File/Download.php

@@ -71,7 +71,7 @@ public function execute()
         $resultRedirect = $this->resultRedirectFactory->create();
         $resultRedirect->setPath('adminhtml/export/index');
         $fileName = $this->getRequest()->getParam('filename');
-        $exportDirectory = $this->filesystem->getDirectoryRead(DirectoryList::VAR_IMPORT_EXPORT);
+        $exportDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::VAR_IMPORT_EXPORT);
 
         try {
             $fileExist = $exportDirectory->isExist('export/' . $fileName);
@@ -87,8 +87,7 @@ public function execute()
 
         try {
             $path = 'export/' . $fileName;
-            $directory = $this->filesystem->getDirectoryRead(DirectoryList::VAR_IMPORT_EXPORT);
-            if ($directory->isFile($path)) {
+            if ($exportDirectory->isFile($path)) {
                 return $this->fileFactory->create(
                     $this->localizedFileName->getFileDisplayName($path),
                     ['type' => 'filename', 'value' => $path],

dev/tests/integration/testsuite/Magento/ImportExport/Controller/Adminhtml/Export/File/DeleteTest.php

@@ -89,11 +89,10 @@ public function testExecute($file): void
     protected function copyFile($destinationFilePath): void
     {
         $driver = $this->varDirectory->getDriver();
+        $absolutePath = $this->varDirectory->getAbsolutePath($destinationFilePath);
 
-        $driver->filePutContents(
-            $this->varDirectory->getAbsolutePath($destinationFilePath),
-            file_get_contents($this->sourceFilePath)
-        );
+        $driver->createDirectory(dirname($absolutePath));
+        $driver->filePutContents($absolutePath, file_get_contents($this->sourceFilePath));
     }
 
     /**

dev/tests/integration/testsuite/Magento/ImportExport/Controller/Adminhtml/Export/File/DownloadTest.php

@@ -49,7 +49,7 @@ class DownloadTest extends AbstractBackendController
     /**
      * @var string
      */
-    private string $sourceFilePath;
+    private $sourceFilePath;
 
     /**
      * @inheritdoc
@@ -58,13 +58,12 @@ protected function setUp(): void
     {
         parent::setUp();
 
+        $this->fileSystem = $this->_objectManager->get(Filesystem::class);
         $this->auth = $this->_objectManager->get(Auth::class);
         $this->auth->getAuthStorage()->setIsFirstPageAfterLogin(false);
         $this->backendUrl = $this->_objectManager->get(BackendUrl::class);
         $this->backendUrl->turnOnSecretKey();
         $this->sourceFilePath = __DIR__ . '/../../Import/_files' . DIRECTORY_SEPARATOR . $this->fileName;
-
-        $this->fileSystem = $this->_objectManager->get(Filesystem::class);
         //Refers to tests 'var' directory
         $this->varDirectory = $this->fileSystem->getDirectoryWrite(DirectoryList::VAR_IMPORT_EXPORT);
     }
@@ -122,16 +121,14 @@ public function testExecute($file): void
      *
      * @param $destinationFilePath
      * @return void
-     * @throws \Magento\Framework\Exception\FileSystemException
      */
     private function copyFile($destinationFilePath): void
     {
         $driver = $this->varDirectory->getDriver();
+        $absolutePath = $this->varDirectory->getAbsolutePath($destinationFilePath);
 
-        $driver->filePutContents(
-            $this->varDirectory->getAbsolutePath($destinationFilePath),
-            file_get_contents($this->sourceFilePath)
-        );
+        $driver->createDirectory(dirname($absolutePath));
+        $driver->filePutContents($absolutePath, file_get_contents($this->sourceFilePath));
     }
 
     /**