Merge branch 'develop' into MQE-1738

Author: soumyau

dev/tests/functional/standalone_bootstrap.php

@@ -51,7 +51,7 @@
     $env->setEnvironmentVariable('DEFAULT_TIMEZONE', DEFAULT_TIMEZONE);
 
     defined('WAIT_TIMEOUT') || define('WAIT_TIMEOUT', 30);
-    $env->setEnvironmentVariable('WAIT_TIMEOUT', 30);
+    $env->setEnvironmentVariable('WAIT_TIMEOUT', WAIT_TIMEOUT);
 
     try {
         new DateTimeZone(DEFAULT_TIMEZONE);

etc/config/functional.suite.dist.yml

@@ -29,6 +29,8 @@ modules:
             username: "%MAGENTO_ADMIN_USERNAME%"
             password: "%MAGENTO_ADMIN_PASSWORD%"
             pageload_timeout: "%WAIT_TIMEOUT%"
+            request_timeout: "%WAIT_TIMEOUT%"
+            connection_timeout: "%WAIT_TIMEOUT%"
             host: "%SELENIUM_HOST%"
             port: "%SELENIUM_PORT%"
             protocol: "%SELENIUM_PROTOCOL%"

src/Magento/FunctionalTestingFramework/_bootstrap.php

@@ -51,7 +51,7 @@
     $env->setEnvironmentVariable('DEFAULT_TIMEZONE', DEFAULT_TIMEZONE);
 
     defined('WAIT_TIMEOUT') || define('WAIT_TIMEOUT', 30);
-    $env->setEnvironmentVariable('WAIT_TIMEOUT', 30);
+    $env->setEnvironmentVariable('WAIT_TIMEOUT', WAIT_TIMEOUT);
 
     try {
         new DateTimeZone(DEFAULT_TIMEZONE);