B2B-2015: [AWS S3] [Integration Tests]: Investigate Test Failures in Framework

Author: NadiyaS

dev/tests/integration/testsuite/Magento/Framework/Image/Adapter/InterfaceTest.php

@@ -88,11 +88,10 @@ protected function _getFixture($pattern)
             return null;
         }
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-
-        /** @var $mediaDirectory \Magento\Framework\Filesystem\Directory\WriteInterface */
-        //$mediaDirectory = $objectManager->get(\Magento\Framework\Filesystem::class)->getDirectoryWrite(DirectoryList::ROOT);
-        $mediaDirectory = $objectManager->get(\Magento\Framework\Filesystem\Directory\TargetDirectory::class)->getDirectoryWrite(DirectoryList::ROOT);
-        return $mediaDirectory->getRelativePath('image/test/' . $pattern);
+        /** @var $rootDirectory \Magento\Framework\Filesystem\Directory\WriteInterface */
+        $rootDirectory = $objectManager->get(\Magento\Framework\Filesystem\Directory\TargetDirectory::class)
+            ->getDirectoryWrite(DirectoryList::ROOT);
+        return $rootDirectory->getRelativePath('image/test/' . $pattern);
     }
 
     /**

dev/tests/integration/testsuite/Magento/Framework/Image/_files/image_fixture.php

@@ -10,8 +10,8 @@
 
 $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 $targetDirectory = $objectManager->get(\Magento\Framework\Filesystem\Directory\TargetDirectory::class);
-/** @var $mediaDirectory \Magento\Framework\Filesystem\Directory\WriteInterface */
-$mediaDirectory = $targetDirectory->getDirectoryWrite(DirectoryList::ROOT);
+/** @var $rootDirectory \Magento\Framework\Filesystem\Directory\WriteInterface */
+$rootDirectory = $targetDirectory->getDirectoryWrite(DirectoryList::ROOT);
 
 $filesToCopy = [
     'empty.png',
@@ -28,10 +28,10 @@
 foreach ($filesToCopy as $fileName) {
     $subDir = 'image/test/';
     $filePath =  $subDir . $fileName;
-    if (!$mediaDirectory->isExist($filePath)) {
-        $mediaDirectory->create($subDir);
-        $mediaDirectory->getDriver()->filePutContents(
-            $mediaDirectory->getAbsolutePath($filePath),
+    if (!$rootDirectory->isExist($filePath)) {
+        $rootDirectory->create($subDir);
+        $rootDirectory->getDriver()->filePutContents(
+            $rootDirectory->getAbsolutePath($filePath),
             file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . $fileName)
         );
     }