MQE-1352: bug fix in dev/tests/functional/lib/Magento/Mtf/Util/Command/Cli.php

Author: jilu1

dev/tests/functional/lib/Magento/Mtf/Util/Command/Cli.php

@@ -72,7 +72,9 @@ public function execute($command, $options = [])
      */
     private function prepareParamArray($command, $options = [])
     {
-        $command .= ' ' . implode(' ', $options);
+        if (!empty($options)) {
+            $command .= ' ' . implode(' ', $options);
+        }
         return [
             'token' => urlencode($this->webapiHandler->getWebapiToken()),
             'command' => urlencode($command)

dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlTransport/WebapiDecorator.php

@@ -171,7 +171,13 @@ protected function setConfiguration(Integration $integration)
      */
     protected function isValidIntegration()
     {
-        $this->write($_ENV['app_frontend_url'] . 'rest/V1/modules', [], CurlInterface::GET);
+        $url = rtrim($_ENV['app_frontend_url'], '/');
+        if (strpos($url, 'index.php') === false) {
+            $url .=  '/index.php/rest/V1/modules';
+        } else {
+            $url .= '/rest/V1/modules';
+        }
+        $this->write($url, [], CurlInterface::GET);
         $response = json_decode($this->read(), true);
 
         return (null !== $response) && !isset($response['message']);
@@ -237,6 +243,10 @@ public function close()
      */
     public function getWebapiToken()
     {
+        // Request token if integration is no longer valid
+        if (!$this->isValidIntegration()) {
+            $this->init();
+        }
         return $this->webapiToken;
     }
 }