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

Author: soumyau

dev/tests/verification/Resources/BasicFunctionalTest.txt

@@ -126,7 +126,7 @@ class BasicFunctionalTestCest
 		$grabMultipleKey1 = $I->grabMultiple(".functionalTestSelector"); // stepKey: grabMultipleKey1
 		$grabTextFromKey1 = $I->grabTextFrom(".functionalTestSelector"); // stepKey: grabTextFromKey1
 		$grabValueFromKey1 = $I->grabValueFrom(".functionalTestSelector"); // stepKey: grabValueFromKey1
-		$magentoCli1 = $I->magentoCLI("maintenance:enable", "\"stuffHere\""); // stepKey: magentoCli1
+		$magentoCli1 = $I->magentoCLI("maintenance:enable", "\"stuffHere\"", 60); // stepKey: magentoCli1
 		$I->comment($magentoCli1);
 		$I->makeScreenshot("screenShotInput"); // stepKey: makeScreenshotKey1
 		$I->maximizeWindow(); // stepKey: maximizeWindowKey1

dev/tests/verification/Resources/DataReplacementTest.txt

@@ -52,7 +52,7 @@ class DataReplacementTestCest
 		$I->searchAndMultiSelectOption("#selector", [msq("uniqueData") . "John", "Doe" . msq("uniqueData")]); // stepKey: parameterArrayReplacementMSQBoth
 		$I->selectMultipleOptions("#Doe" . msq("uniqueData"), "#element", [msq("uniqueData") . "John", "Doe" . msq("uniqueData")]); // stepKey: multiSelectDataReplacement
 		$I->fillField(".selector", "0"); // stepKey: insertZero
-		$insertCommand = $I->magentoCLI("do something Doe" . msq("uniqueData") . " with uniqueness"); // stepKey: insertCommand
+		$insertCommand = $I->magentoCLI("do something Doe" . msq("uniqueData") . " with uniqueness", 60); // stepKey: insertCommand
 		$I->comment($insertCommand);
 		$I->seeInPageSource("StringBefore John StringAfter"); // stepKey: htmlReplace1
 		$I->seeInPageSource("#John"); // stepKey: htmlReplace2

src/Magento/FunctionalTestingFramework/Module/MagentoWebDriver.php

@@ -519,7 +519,7 @@ public function scrollToTopOfPage()
      */
     public function magentoCLI($command, $arguments = null, $timeout = null)
     {
-        return $this->curlExecMagentoCLI($command,  $arguments, $timeout);
+        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,19 +673,19 @@ public function fillSecretField($field, $value)
      * Function used to create data that contains sensitive credentials in a <createData> <field> override.
      * The data is decrypted immediately prior to data creation to avoid exposure in console or log.
      *
-     * @param string $command
-     * @param null   $arguments
-     * @param int    $timeout
+     * @param string  $command
+     * @param null    $arguments
+     * @param null    $timeout
      * @throws TestFrameworkException
      * @return string
      */
-    public function magentoCLISecret($command, $timeout, $arguments = null)
+    public function magentoCLISecret($command, $arguments = null, $timeout = 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, $timeout, $arguments);
+        return $this->magentoCLI($decryptedCommand, $arguments, $timeout);
     }
 
     /**
@@ -837,20 +837,21 @@ public function makeScreenshot($name = null)
     /**
      * Takes given $command and executes it against bin/magento executable. Returns stdout output from the command.
      *
-     * @param string $command
-     * @param string $arguments
+     * @param string  $command
+     * @param string  $arguments
+     * @param integer $timeout
      *
      * @throws \RuntimeException
      * @return string
      * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
      */
-    private function shellExecMagentoCLI($command, $arguments): string
+    private function shellExecMagentoCLI($command, $arguments, $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;
         $process = new Process(escapeshellcmd($command), MAGENTO_BP);
-        $process->setIdleTimeout(60);
+        $process->setIdleTimeout($timeout);
         $process->setTimeout(0);
         $exitCode = $process->run();
         if ($exitCode !== 0) {
@@ -867,9 +868,10 @@ private function shellExecMagentoCLI($command, $arguments): string
      * @param string  $arguments
      * @param integer $timeout
      *
+     * @return string
      * @throws TestFrameworkException
      */
-    private function curlExecMagentoCLI($command,  $arguments, $timeout): string
+    private function curlExecMagentoCLI($command, $arguments, $timeout): string
     {
         // Remove index.php if it's present in url
         $baseUrl = rtrim(

src/Magento/FunctionalTestingFramework/Test/Objects/ActionObject.php

@@ -63,6 +63,7 @@ class ActionObject
     const DELETE_DATA_MUTUAL_EXCLUSIVE_ATTRIBUTES = ["url", "createDataKey"];
     const EXTERNAL_URL_AREA_INVALID_ACTIONS = ['amOnPage'];
     const FUNCTION_CLOSURE_ACTIONS = ['waitForElementChange', 'performOn', 'executeInSelenium'];
+    const COMMAND_ACTION_ATTRIBUTES = ['magentoCLI', 'magentoCLISecret'];
     const MERGE_ACTION_ORDER_AFTER = 'after';
     const MERGE_ACTION_ORDER_BEFORE = 'before';
     const ACTION_ATTRIBUTE_TIMEZONE = 'timezone';
@@ -72,6 +73,7 @@ class ActionObject
     const ACTION_ATTRIBUTE_VARIABLE_REGEX_PATTERN = '/({{[\w]+\.[\w\[\]]+}})|({{[\w]+\.[\w]+\((?(?!}}).)+\)}})/';
     const STRING_PARAMETER_REGEX = "/'[^']+'/";
     const DEFAULT_WAIT_TIMEOUT = 10;
+    const DEFAULT_COMMAND_WAIT_TIMEOUT = 60;
     const ACTION_ATTRIBUTE_USERINPUT = 'userInput';
     const ACTION_TYPE_COMMENT = 'comment';
 

src/Magento/FunctionalTestingFramework/Util/TestGenerator.php

@@ -42,7 +42,6 @@ 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',
@@ -611,11 +610,14 @@ public function generateStepsPhp($actionObjects, $generationScope = TestGenerato
                 $time = $customActionAttributes['time'];
             }
             if (isset($customActionAttributes['timeout'])) {
-                $commandTimeout = $customActionAttributes['timeout'];
+                $time = $customActionAttributes['timeout'];
             }
-            $time = $time ?? ActionObject::getDefaultWaitTimeout();
 
-            $commandTimeout = $commandTimeout ?? self::COMMAND_WAIT_TIMEOUT;
+            if (in_array($actionObject->getType(), ActionObject::COMMAND_ACTION_ATTRIBUTES)) {
+                $time = $time ?? ActionObject::DEFAULT_COMMAND_WAIT_TIMEOUT;
+            } else {
+                $time = $time ?? ActionObject::getDefaultWaitTimeout();
+            }
 
             if (isset($customActionAttributes['parameterArray']) && $actionObject->getType() != 'pressKey') {
                 // validate the param array is in the correct format
@@ -1285,7 +1287,7 @@ public function generateStepsPhp($actionObjects, $generationScope = TestGenerato
                         $actionObject,
                         $command,
                         $arguments,
-                        $commandTimeout
+                        $time
                     );
                     $testSteps .= sprintf(self::STEP_KEY_ANNOTATION, $stepKey) . PHP_EOL;
                     $testSteps .= sprintf(