MQE-1711: Switch between Developer mode and Production mode takes long time and the test end up time out.

Author: soumyau

etc/config/command.php

@@ -14,6 +14,7 @@
     $tokenPassedIn = urldecode($_POST['token'] ?? '');
     $command = urldecode($_POST['command'] ?? '');
     $arguments = urldecode($_POST['arguments'] ?? '');
+    $timeout = urldecode($_POST['timeout'] ?? 60);
 
     // Token returned will be null if the token we passed in is invalid
     $tokenFromMagento = $tokenModel->loadByToken($tokenPassedIn)->getToken();
@@ -24,7 +25,7 @@
         if ($valid) {
             $fullCommand = escapeshellcmd($magentoBinary . " $command" . " $arguments");
             $process = new Symfony\Component\Process\Process($fullCommand);
-            $process->setIdleTimeout(60);
+            $process->setIdleTimeout($timeout);
             $process->setTimeout(0);
             $idleTimeout = false;
             try {

src/Magento/FunctionalTestingFramework/Module/MagentoWebDriver.php

@@ -510,14 +510,16 @@ public function scrollToTopOfPage()
     /**
      * Takes given $command and executes it against bin/magento or custom exposed entrypoint. Returns command output.
      *
-     * @param string $command
-     * @param string $arguments
+     * @param string  $command
+     * @param string  $arguments
+     * @param integer $timeout
      * @return string
+     *
      * @throws TestFrameworkException
      */
-    public function magentoCLI($command, $arguments = null)
+    public function magentoCLI($command, $arguments = null, $timeout = null)
     {
-        return $this->curlExecMagentoCLI($command, $arguments);
+        return $this->curlExecMagentoCLI($command,  $arguments, $timeout);
         //TODO: calling bin/magento from pipeline is timing out, needs investigation (ref: MQE-1774)
 //        try {
 //            return $this->shellExecMagentoCLI($command, $arguments);
@@ -673,16 +675,17 @@ public function fillSecretField($field, $value)
      *
      * @param string $command
      * @param null   $arguments
+     * @param int    $timeout
      * @throws TestFrameworkException
      * @return string
      */
-    public function magentoCLISecret($command, $arguments = null)
+    public function magentoCLISecret($command, $timeout, $arguments = null)
     {
         // to protect any secrets from being printed to console the values are executed only at the webdriver level as a
         // decrypted value
 
         $decryptedCommand = CredentialStore::getInstance()->decryptAllSecretsInString($command);
-        return $this->magentoCLI($decryptedCommand, $arguments);
+        return $this->magentoCLI($decryptedCommand, $timeout, $arguments);
     }
 
     /**
@@ -860,12 +863,13 @@ private function shellExecMagentoCLI($command, $arguments): string
     /**
      * Takes given $command and executes it against exposed MTF CLI entry point. Returns response from server.
      *
-     * @param string $command
-     * @param string $arguments
-     * @return string
+     * @param string  $command
+     * @param string  $arguments
+     * @param integer $timeout
+     *
      * @throws TestFrameworkException
      */
-    private function curlExecMagentoCLI($command, $arguments): string
+    private function curlExecMagentoCLI($command,  $arguments, $timeout): string
     {
         // Remove index.php if it's present in url
         $baseUrl = rtrim(
@@ -882,6 +886,7 @@ private function curlExecMagentoCLI($command, $arguments): string
                 'token' => $restExecutor->getAuthToken(),
                 getenv('MAGENTO_CLI_COMMAND_PARAMETER') => $command,
                 'arguments' => $arguments,
+                'timeout'   => $timeout,
             ],
             CurlInterface::POST,
             []

src/Magento/FunctionalTestingFramework/Test/etc/Actions/customActions.xsd

@@ -50,6 +50,13 @@
                         </xs:documentation>
                     </xs:annotation>
                 </xs:attribute>
+                <xs:attribute type="xs:string" name="timeout">
+                    <xs:annotation>
+                        <xs:documentation>
+                            Idle timeout in seconds, defaulted to 60s when not specified.
+                        </xs:documentation>
+                    </xs:annotation>
+                </xs:attribute>
                 <xs:attributeGroup ref="commonActionAttributes"/>
             </xs:extension>
         </xs:simpleContent>

src/Magento/FunctionalTestingFramework/Util/TestGenerator.php

@@ -42,6 +42,7 @@ class TestGenerator
     const HOOK_SCOPE = 'hook';
     const SUITE_SCOPE = 'suite';
     const PRESSKEY_ARRAY_ANCHOR_KEY = '987654321098765432109876543210';
+    const COMMAND_WAIT_TIMEOUT = 60;
     const PERSISTED_OBJECT_NOTATION_REGEX = '/\${1,2}[\w.\[\]]+\${1,2}/';
     const NO_STEPKEY_ACTIONS = [
         'comment',
@@ -532,6 +533,7 @@ public function generateStepsPhp($actionObjects, $generationScope = TestGenerato
             $sortOrder = null;
             $storeCode = null;
             $format = null;
+            $commandTimeout = null;
 
             $assertExpected = null;
             $assertActual = null;
@@ -609,10 +611,12 @@ public function generateStepsPhp($actionObjects, $generationScope = TestGenerato
                 $time = $customActionAttributes['time'];
             }
             if (isset($customActionAttributes['timeout'])) {
-                $time = $customActionAttributes['timeout'];
+                $commandTimeout = $customActionAttributes['timeout'];
             }
             $time = $time ?? ActionObject::getDefaultWaitTimeout();
 
+            $commandTimeout = $commandTimeout ?? self::COMMAND_WAIT_TIMEOUT;
+
             if (isset($customActionAttributes['parameterArray']) && $actionObject->getType() != 'pressKey') {
                 // validate the param array is in the correct format
                 $this->validateParameterArray($customActionAttributes['parameterArray']);
@@ -1280,7 +1284,8 @@ public function generateStepsPhp($actionObjects, $generationScope = TestGenerato
                         $actor,
                         $actionObject,
                         $command,
-                        $arguments
+                        $arguments,
+                        $commandTimeout
                     );
                     $testSteps .= sprintf(self::STEP_KEY_ANNOTATION, $stepKey) . PHP_EOL;
                     $testSteps .= sprintf(