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

fixed issue with signature of magentoCLI

Author: soumyau

dev/tests/verification/Resources/ActionGroupWithStepKeyReferences.txt

@@ -45,7 +45,7 @@ class ActionGroupWithStepKeyReferencesCest
 		$I->fillField($action1); // stepKey: action1ActionGroup
 		$I->comment("Invocation stepKey will be appended in non stepKey instances");
 		$action3ActionGroup = $I->executeJS($action3ActionGroup); // stepKey: action3ActionGroup
-		$action4ActionGroup = $I->magentoCLI($action4ActionGroup, "\"stuffHere\"", 60); // stepKey: action4ActionGroup
+		$action4ActionGroup = $I->magentoCLI($action4ActionGroup, 60, "\"stuffHere\""); // stepKey: action4ActionGroup
 		$I->comment($action4ActionGroup);
 		$date = new \DateTime();
 		$date->setTimestamp(strtotime("{$action5}"));

dev/tests/verification/Resources/BasicFunctionalTest.txt

@@ -126,8 +126,10 @@ 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\"", 60); // stepKey: magentoCli1
+		$magentoCli1 = $I->magentoCLI("maintenance:enable", 60, "\"stuffHere\""); // stepKey: magentoCli1
 		$I->comment($magentoCli1);
+		$magentoCli2 = $I->magentoCLI("maintenance:enable", 120, "\"stuffHere\""); // stepKey: magentoCli2
+		$I->comment($magentoCli2);
 		$I->makeScreenshot("screenShotInput"); // stepKey: makeScreenshotKey1
 		$I->maximizeWindow(); // stepKey: maximizeWindowKey1
 		$I->moveBack(); // stepKey: moveBackKey1

dev/tests/verification/TestModule/Test/BasicFunctionalTest.xml

@@ -76,6 +76,7 @@
         <grabTextFrom selector=".functionalTestSelector" stepKey="grabTextFromKey1" />
         <grabValueFrom selector=".functionalTestSelector" stepKey="grabValueFromKey1" />
         <magentoCLI command="maintenance:enable" arguments="&quot;stuffHere&quot;" stepKey="magentoCli1"/>
+        <magentoCLI command="maintenance:enable" arguments="&quot;stuffHere&quot;" timeout="120" stepKey="magentoCli2"/>
         <makeScreenshot userInput="screenShotInput" stepKey="makeScreenshotKey1"/>
         <maximizeWindow stepKey="maximizeWindowKey1"/>
         <moveBack stepKey="moveBackKey1"/>

src/Magento/FunctionalTestingFramework/Module/MagentoWebDriver.php

@@ -511,15 +511,15 @@ 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 integer $timeout
+     * @param string  $arguments
      * @return string
      *
      * @throws TestFrameworkException
      */
-    public function magentoCLI($command, $arguments = null, $timeout = null)
+    public function magentoCLI($command, $timeout = null, $arguments = null)
     {
-        return $this->curlExecMagentoCLI($command, $arguments, $timeout);
+        return $this->curlExecMagentoCLI($command, $timeout, $arguments);
         //TODO: calling bin/magento from pipeline is timing out, needs investigation (ref: MQE-1774)
 //        try {
 //            return $this->shellExecMagentoCLI($command, $arguments);
@@ -674,18 +674,18 @@ public function fillSecretField($field, $value)
      * The data is decrypted immediately prior to data creation to avoid exposure in console or log.
      *
      * @param string $command
-     * @param null   $arguments
      * @param null   $timeout
+     * @param null   $arguments
      * @throws TestFrameworkException
      * @return string
      */
-    public function magentoCLISecret($command, $arguments = null, $timeout = null)
+    public function magentoCLISecret($command, $timeout = null, $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, $timeout);
+        return $this->magentoCLI($decryptedCommand, $timeout, $arguments);
     }
 
     /**
@@ -845,7 +845,7 @@ public function makeScreenshot($name = null)
      * @return string
      * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
      */
-    private function shellExecMagentoCLI($command, $arguments, $timeout): string
+    private function shellExecMagentoCLI($command, $arguments, $timeout = 60): string
     {
         $php = PHP_BINDIR ? PHP_BINDIR . DIRECTORY_SEPARATOR. 'php' : 'php';
         $binMagento = realpath(MAGENTO_BP . DIRECTORY_SEPARATOR . 'bin' . DIRECTORY_SEPARATOR . 'magento');
@@ -865,13 +865,13 @@ private function shellExecMagentoCLI($command, $arguments, $timeout): string
      * Takes given $command and executes it against exposed MTF CLI entry point. Returns response from server.
      *
      * @param string  $command
-     * @param string  $arguments
      * @param integer $timeout
+     * @param string  $arguments
      *
      * @return string
      * @throws TestFrameworkException
      */
-    private function curlExecMagentoCLI($command, $arguments, $timeout): string
+    private function curlExecMagentoCLI($command, $timeout, $arguments): string
     {
         // Remove index.php if it's present in url
         $baseUrl = rtrim(

src/Magento/FunctionalTestingFramework/Util/TestGenerator.php

@@ -1285,8 +1285,8 @@ public function generateStepsPhp($actionObjects, $generationScope = TestGenerato
                         $actor,
                         $actionObject,
                         $command,
-                        $arguments,
-                        $time
+                        $time,
+                        $arguments
                     );
                     $testSteps .= sprintf(self::STEP_KEY_ANNOTATION, $stepKey) . PHP_EOL;
                     $testSteps .= sprintf(