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->getDirectoryWrite(DirectoryList::VAR_IMPORT_EXPORT);
+        $exportDirectory = $this->filesystem->getDirectoryRead(DirectoryList::VAR_IMPORT_EXPORT);
 
         try {
             $fileExist = $exportDirectory->isExist('export/' . $fileName);
@@ -87,7 +87,8 @@ public function execute()
 
         try {
             $path = 'export/' . $fileName;
-            if ($exportDirectory->isFile($path)) {
+            $directory = $this->filesystem->getDirectoryRead(DirectoryList::VAR_IMPORT_EXPORT);
+            if ($directory->isFile($path)) {
                 return $this->fileFactory->create(
                     $this->localizedFileName->getFileDisplayName($path),
                     ['type' => 'filename', 'value' => $path],

app/code/Magento/RemoteStorage/etc/di.xml

@@ -11,21 +11,14 @@
     <preference for="Magento\RemoteStorage\Driver\Adapter\MetadataProviderInterface" type="Magento\RemoteStorage\Driver\Adapter\MetadataProvider"/>
     <preference for="Magento\RemoteStorage\Driver\Adapter\MetadataProviderFactoryInterface" type="Magento\RemoteStorage\Driver\Adapter\MetadataProviderFactory"/>
     <preference for="Magento\Framework\Filesystem\DriverPool" type="Magento\RemoteStorage\Driver\DriverPool"/>
-    <virtualType name="remoteWriteFactory" type="Magento\Framework\Filesystem\Directory\WriteFactory">
-        <arguments>
-            <argument name="driverPool" xsi:type="object">Magento\RemoteStorage\Driver\DriverPool</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="remoteReadFactory" type="Magento\Framework\Filesystem\Directory\ReadFactory">
-        <arguments>
-            <argument name="driverPool" xsi:type="object">Magento\RemoteStorage\Driver\DriverPool</argument>
-        </arguments>
-    </virtualType>
     <type name="Magento\RemoteStorage\Filesystem">
         <arguments>
             <argument name="writeFactory" xsi:type="object">
                 Magento\RemoteStorage\Model\Filesystem\Directory\WriteFactory
             </argument>
+            <argument name="readFactory" xsi:type="object">
+                Magento\RemoteStorage\Model\Filesystem\Directory\ReaderFactory
+            </argument>
         </arguments>
     </type>
     <virtualType name="customRemoteFilesystem" type="Magento\RemoteStorage\Filesystem">

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

@@ -59,13 +59,13 @@ 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);
+        $auth = $this->_objectManager->get(Auth::class);
+        $auth->getAuthStorage()->setIsFirstPageAfterLogin(false);
         $this->backendUrl = $this->_objectManager->get(BackendUrl::class);
         $this->backendUrl->turnOnSecretKey();
         $this->sourceFilePath = __DIR__ . '/../../Import/_files' . DIRECTORY_SEPARATOR . $this->fileName;
         //Refers to tests 'var' directory
-        $this->varDirectory = $this->fileSystem->getDirectoryWrite(DirectoryList::VAR_IMPORT_EXPORT);
+        $this->varDirectory = $this->fileSystem->getDirectoryRead(DirectoryList::VAR_DIR);
     }
 
     /**
@@ -124,11 +124,9 @@ public function testExecute($file): void
      */
     private function copyFile($destinationFilePath): void
     {
-        $driver = $this->varDirectory->getDriver();
-        $absolutePath = $this->varDirectory->getAbsolutePath($destinationFilePath);
-
-        $driver->createDirectory(dirname($absolutePath));
-        $driver->filePutContents($absolutePath, file_get_contents($this->sourceFilePath));
+        //Refers to application root directory
+        $rootDirectory = $this->fileSystem->getDirectoryWrite(DirectoryList::ROOT);
+        $rootDirectory->copyFile($this->sourceFilePath, $this->varDirectory->getAbsolutePath($destinationFilePath));
     }
 
     /**
@@ -161,7 +159,7 @@ public static function tearDownAfterClass(): void
     {
         $filesystem = Bootstrap::getObjectManager()->get(Filesystem::class);
         /** @var WriteInterface $directory */
-        $directory = $filesystem->getDirectoryWrite(DirectoryList::VAR_IMPORT_EXPORT);
+        $directory = $filesystem->getDirectoryWrite(DirectoryList::VAR_DIR);
         if ($directory->isExist('export')) {
             $directory->delete('export');
         }