MQE-1774: Review community PR #343

Fix for pipeline step failures on execution of bin/magento from WebDriver.

Author: soumyau

src/Magento/FunctionalTestingFramework/Module/MagentoWebDriver.php

@@ -515,15 +515,19 @@ public function scrollToTopOfPage()
      * @return string
      * @throws TestFrameworkException
      */
-    public function magentoCLI($command, $arguments = null)
+    public function magentoCLI($command,  $timeout = null, $arguments = null)
     {
-        try {
+        //TODO: shellExecMagentoCLI is causing pipeline steps to fail, needs investigation
+        return $this->curlExecMagentoCLI($command, $timeout, $arguments, $timeout);
+/*        try {
             return $this->shellExecMagentoCLI($command, $arguments);
         } catch (\Exception $exception) {
             return $this->curlExecMagentoCLI($command, $arguments);
-        }
+  }
+*/
     }
 
+
     /**
      * Runs DELETE request to delete a Magento entity against the url given.
      *
@@ -834,17 +838,18 @@ public function makeScreenshot($name = null)
      *
      * @param string $command
      * @param string $arguments
+     * @param string $timeout
      *
      * @throws \RuntimeException
      * @return string
      */
-    private function shellExecMagentoCLI($command, $arguments): string
+    private function shellExecMagentoCLI($command, $timeout): string
     {
         $php = PHP_BINDIR ? PHP_BINDIR . DIRECTORY_SEPARATOR. 'php' : 'php';
         $binMagento = realpath(MAGENTO_BP . DIRECTORY_SEPARATOR . 'bin' . DIRECTORY_SEPARATOR . 'magento');
-        $command = $php . ' -f ' . $binMagento . ' ' . $command . ' ' . $arguments;
+        $command = $php . ' -f ' . $binMagento . ' ' . $command;
         $process = new Process(escapeshellcmd($command), MAGENTO_BP);
-        $process->setIdleTimeout(60);
+        $process->setIdleTimeout($timeout);
         $process->setTimeout(0);
         $exitCode = $process->run();
         if ($exitCode !== 0) {
@@ -859,10 +864,11 @@ private function shellExecMagentoCLI($command, $arguments): string
      *
      * @param string $command
      * @param string $arguments
+     * @param string $timeout
      * @return string
      * @throws TestFrameworkException
      */
-    private function curlExecMagentoCLI($command, $arguments): string
+    private function curlExecMagentoCLI($command, $timeout, $arguments): string
     {
         // Remove index.php if it's present in url
         $baseUrl = rtrim(
@@ -879,6 +885,7 @@ private function curlExecMagentoCLI($command, $arguments): string
                 'token' => $restExecutor->getAuthToken(),
                 getenv('MAGENTO_CLI_COMMAND_PARAMETER') => $command,
                 'arguments' => $arguments,
+                'timeout' => $timeout,
             ],
             CurlInterface::POST,
             []