Merge remote-tracking branch 'ogresCE/MAGETWO-44713-install-log-error' into PR_Branch

Author: mazhalai

setup/src/Magento/Setup/Controller/Install.php

@@ -120,7 +120,17 @@ public function progressAction()
     {
         $percent = 0;
         $success = false;
+        $contents = [];
         $json = new JsonModel();
+
+        // Depending upon the install environment and network latency, there is a possibility that
+        // "progress" check request may arrive before the Install POST request. In that case
+        // "install.log" file may not be created yet. Check the "install.log" is created before
+        // trying to read from it.
+        if (!$this->log->logfileExists()) {
+            return $json->setVariables(['progress' => $percent, 'success' => true, 'console' => $contents]);
+        }
+
         try {
             $progress = $this->progressFactory->createFromLog($this->log);
             $percent = sprintf('%d', $progress->getRatio() * 100);

setup/src/Magento/Setup/Model/WebLogger.php

@@ -137,6 +137,16 @@ public function clear()
         }
     }
 
+    /**
+     * Checks existence of install.log file
+     *
+     * @return bool
+     */
+    public function logfileExists()
+    {
+        return ($this->directory->isExist($this->logFile));
+    }
+
     /**
      * Terminates line if the inline logging is started
      *

setup/src/Magento/Setup/Test/Unit/Controller/InstallTest.php

@@ -42,6 +42,7 @@ public function setUp()
         $this->installer = $this->getMock('\Magento\Setup\Model\Installer', [], [], '', false);
         $this->progressFactory = $this->getMock('\Magento\Setup\Model\Installer\ProgressFactory', [], [], '', false);
         $this->sampleDataState = $this->getMock('\Magento\Framework\Setup\SampleData\State', [], [], '', false);
+
         $installerFactory->expects($this->once())->method('create')->with($this->webLogger)
             ->willReturn($this->installer);
         $this->controller = new Install(
@@ -100,6 +101,8 @@ public function testProgressAction()
     {
         $numValue = 42;
         $consoleMessages = ['key1' => 'log message 1', 'key2' => 'log message 2'];
+
+        $this->webLogger->expects($this->once())->method('logfileExists')->willReturn(true);
         $progress = $this->getMock('\Magento\Setup\Model\Installer\Progress', [], [], '', false);
         $this->progressFactory->expects($this->once())->method('createFromLog')->with($this->webLogger)
             ->willReturn($progress);
@@ -119,6 +122,7 @@ public function testProgressAction()
     public function testProgressActionWithError()
     {
         $e = 'Some exception message';
+        $this->webLogger->expects($this->once())->method('logfileExists')->willReturn(true);
         $this->progressFactory->expects($this->once())->method('createFromLog')
             ->will($this->throwException(new \LogicException($e)));
         $jsonModel = $this->controller->progressAction();
@@ -134,6 +138,7 @@ public function testProgressActionWithError()
     public function testProgressActionWithSampleDataError()
     {
         $numValue = 42;
+        $this->webLogger->expects($this->once())->method('logfileExists')->willReturn(true);
         $progress = $this->getMock('\Magento\Setup\Model\Installer\Progress', [], [], '', false);
         $progress->expects($this->once())->method('getRatio')->willReturn($numValue);
         $this->progressFactory->expects($this->once())->method('createFromLog')->willReturn($progress);
@@ -148,6 +153,19 @@ public function testProgressActionWithSampleDataError()
         $this->assertSame(sprintf('%d', $numValue * 100), $variables['progress']);
     }
 
+    public function testProgressActionNoInstallLogFile()
+    {
+        $this->webLogger->expects($this->once())->method('logfileExists')->willReturn(false);
+        $jsonModel = $this->controller->progressAction();
+        $this->assertInstanceOf('\Zend\View\Model\JsonModel', $jsonModel);
+        $variables = $jsonModel->getVariables();
+        $this->assertArrayHasKey('success', $variables);
+        $this->assertArrayHasKey('console', $variables);
+        $this->assertTrue($variables['success']);
+        $this->assertEmpty($variables['console']);
+        $this->assertSame(0, $variables['progress']);
+    }
+
     public function testDispatch()
     {
         $request = $this->getMock('\Zend\Http\PhpEnvironment\Request', [], [], '', false);