ACQE-5871: Add ability to increase default MFTF MagentoCLI timeout

Author: jilu1

etc/config/.env.example

@@ -61,6 +61,9 @@ MODULE_ALLOWLIST=Magento_Framework,ConfigurableProductWishlist,ConfigurableProdu
 #*** Default timeout for wait actions
 WAIT_TIMEOUT=60
 
+#*** Default timeout for 'magentoCLI' and 'magentoCLISecret' command
+MAGENTO_CLI_WAIT_TIMEOUT=60
+
 #*** Uncomment and set to enable all tests, regardless of passing status, to have all their Allure artifacts.
 #VERBOSE_ARTIFACTS=true
 

etc/config/command.php

@@ -14,7 +14,7 @@
     $tokenPassedIn = urldecode($_POST['token'] ?? '');
     $command = urldecode($_POST['command'] ?? '');
     $arguments = urldecode($_POST['arguments'] ?? '');
-    $timeout = floatval(urldecode($_POST['timeout'] ?? 60));
+    $timeout = floatval(urldecode($_POST['timeout'] ?? getenv('MAGENTO_CLI_WAIT_TIMEOUT')));
 
     // Token returned will be null if the token we passed in is invalid
     $tokenFromMagento = $tokenModel->loadByToken($tokenPassedIn)->getToken();

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

@@ -72,7 +72,6 @@ class ActionObject
     const ACTION_ATTRIBUTE_VARIABLE_REGEX_PARAMETER = '/\(.+\)/';
     const ACTION_ATTRIBUTE_VARIABLE_REGEX_PATTERN = '/({{[\w]+\.[\w\[\]]+}})|({{[\w]+\.[\w]+\((?(?!}}).)+\)}})/';
     const STRING_PARAMETER_REGEX = "/'[^']+'/";
-    const DEFAULT_COMMAND_WAIT_TIMEOUT = 60;
     const ACTION_ATTRIBUTE_USERINPUT = 'userInput';
     const ACTION_TYPE_COMMENT = 'comment';
     const ACTION_TYPE_HELPER = 'helper';
@@ -184,6 +183,16 @@ public static function getDefaultWaitTimeout()
         return getenv('WAIT_TIMEOUT');
     }
 
+    /**
+     * Retrieve default timeout for 'magentoCLI' or 'magentoCLISecret' in seconds
+     *
+     * @return integer
+     */
+    public static function getDefaultMagentoCLIWaitTimeout()
+    {
+        return getenv('MAGENTO_CLI_WAIT_TIMEOUT');
+    }
+
     /**
      * This function returns the string property stepKey.
      *

src/Magento/FunctionalTestingFramework/Util/TestGenerator.php

@@ -842,7 +842,7 @@ public function generateStepsPhp($actionObjects, $generationScope = TestGenerato
             }
 
             if (in_array($actionObject->getType(), ActionObject::COMMAND_ACTION_ATTRIBUTES)) {
-                $time = $time ?? ActionObject::DEFAULT_COMMAND_WAIT_TIMEOUT;
+                $time = $time ?? ActionObject::getDefaultMagentoCLIWaitTimeout();
             } else {
                 $time = $time ?? ActionObject::getDefaultWaitTimeout();
             }