From be71f945893f63e65cd1606d241b87631bbabd21 Mon Sep 17 00:00:00 2001 From: Kevin Kozan Date: Thu, 21 Nov 2019 10:40:45 -0600 Subject: [PATCH 1/4] MQE-1520: Consolidate WAIT_TIMEOUT in .env and pageload_timeout in config - changed functional.suite.dist to use wait timeout - added default setters in bootstrap files (will always be defined) - removed default in actionObject --- dev/tests/functional/standalone_bootstrap.php | 5 ++++- etc/config/functional.suite.dist.yml | 2 +- .../FunctionalTestingFramework/Test/Objects/ActionObject.php | 3 +-- src/Magento/FunctionalTestingFramework/_bootstrap.php | 3 +++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dev/tests/functional/standalone_bootstrap.php b/dev/tests/functional/standalone_bootstrap.php index de6ef394d..ab6372697 100755 --- a/dev/tests/functional/standalone_bootstrap.php +++ b/dev/tests/functional/standalone_bootstrap.php @@ -49,7 +49,10 @@ defined('DEFAULT_TIMEZONE') || define('DEFAULT_TIMEZONE', 'America/Los_Angeles'); $env->setEnvironmentVariable('DEFAULT_TIMEZONE', DEFAULT_TIMEZONE); - + + defined('WAIT_TIMEOUT') || define('WAIT_TIMEOUT', 10); + $env->setEnvironmentVariable('WAIT_TIMEOUT', 10); + try { new DateTimeZone(DEFAULT_TIMEZONE); } catch (\Exception $e) { diff --git a/etc/config/functional.suite.dist.yml b/etc/config/functional.suite.dist.yml index 12658515b..5487a3c99 100644 --- a/etc/config/functional.suite.dist.yml +++ b/etc/config/functional.suite.dist.yml @@ -27,7 +27,7 @@ modules: window_size: 1280x1024 username: "%MAGENTO_ADMIN_USERNAME%" password: "%MAGENTO_ADMIN_PASSWORD%" - pageload_timeout: 30 + pageload_timeout: "%WAIT_TIMEOUT%" host: "%SELENIUM_HOST%" port: "%SELENIUM_PORT%" protocol: "%SELENIUM_PROTOCOL%" diff --git a/src/Magento/FunctionalTestingFramework/Test/Objects/ActionObject.php b/src/Magento/FunctionalTestingFramework/Test/Objects/ActionObject.php index 9b1cdf1af..8f60e1e90 100644 --- a/src/Magento/FunctionalTestingFramework/Test/Objects/ActionObject.php +++ b/src/Magento/FunctionalTestingFramework/Test/Objects/ActionObject.php @@ -71,7 +71,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_WAIT_TIMEOUT = 10; const ACTION_ATTRIBUTE_USERINPUT = 'userInput'; const ACTION_TYPE_COMMENT = 'comment'; @@ -167,7 +166,7 @@ public function __construct( */ public static function getDefaultWaitTimeout() { - return getenv('WAIT_TIMEOUT') ?: self::DEFAULT_WAIT_TIMEOUT; + return getenv('WAIT_TIMEOUT'); } /** diff --git a/src/Magento/FunctionalTestingFramework/_bootstrap.php b/src/Magento/FunctionalTestingFramework/_bootstrap.php index e401123b6..490ff61de 100644 --- a/src/Magento/FunctionalTestingFramework/_bootstrap.php +++ b/src/Magento/FunctionalTestingFramework/_bootstrap.php @@ -50,6 +50,9 @@ defined('DEFAULT_TIMEZONE') || define('DEFAULT_TIMEZONE', 'America/Los_Angeles'); $env->setEnvironmentVariable('DEFAULT_TIMEZONE', DEFAULT_TIMEZONE); + defined('WAIT_TIMEOUT') || define('WAIT_TIMEOUT', 10); + $env->setEnvironmentVariable('WAIT_TIMEOUT', 10); + try { new DateTimeZone(DEFAULT_TIMEZONE); } catch (\Exception $e) { From ab0d3c5bb77a1a70f7544df0287b04d519c13154 Mon Sep 17 00:00:00 2001 From: Kevin Kozan Date: Thu, 21 Nov 2019 13:12:36 -0600 Subject: [PATCH 2/4] MQE-1520: Consolidate WAIT_TIMEOUT in .env and pageload_timeout - Fixed Verification Tests --- dev/tests/_bootstrap.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dev/tests/_bootstrap.php b/dev/tests/_bootstrap.php index b41f80394..3f57ad139 100644 --- a/dev/tests/_bootstrap.php +++ b/dev/tests/_bootstrap.php @@ -45,7 +45,8 @@ 'MAGENTO_BACKEND_NAME' => 'admin', 'MAGENTO_ADMIN_USERNAME' => 'admin', 'MAGENTO_ADMIN_PASSWORD' => 'admin123', - 'DEFAULT_TIMEZONE' => 'America/Los_Angeles' + 'DEFAULT_TIMEZONE' => 'America/Los_Angeles', + 'WAIT_TIMEOUT' => '10' ]; foreach ($TEST_ENVS as $key => $value) { From cc5932aac7ae1b903681071573f86d93e730b7ce Mon Sep 17 00:00:00 2001 From: Kevin Kozan Date: Fri, 22 Nov 2019 10:23:47 -0600 Subject: [PATCH 3/4] MQE-1520: Consolidate WAIT_TIMEOUT in .env and pageload_timeout - CR Fixes --- dev/tests/functional/standalone_bootstrap.php | 4 ++-- docs/configuration.md | 8 ++++++++ src/Magento/FunctionalTestingFramework/_bootstrap.php | 4 ++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dev/tests/functional/standalone_bootstrap.php b/dev/tests/functional/standalone_bootstrap.php index ab6372697..486c7566b 100755 --- a/dev/tests/functional/standalone_bootstrap.php +++ b/dev/tests/functional/standalone_bootstrap.php @@ -50,8 +50,8 @@ defined('DEFAULT_TIMEZONE') || define('DEFAULT_TIMEZONE', 'America/Los_Angeles'); $env->setEnvironmentVariable('DEFAULT_TIMEZONE', DEFAULT_TIMEZONE); - defined('WAIT_TIMEOUT') || define('WAIT_TIMEOUT', 10); - $env->setEnvironmentVariable('WAIT_TIMEOUT', 10); + defined('WAIT_TIMEOUT') || define('WAIT_TIMEOUT', 30); + $env->setEnvironmentVariable('WAIT_TIMEOUT', 30); try { new DateTimeZone(DEFAULT_TIMEZONE); diff --git a/docs/configuration.md b/docs/configuration.md index 4af2c4e82..5140c01e7 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -295,6 +295,14 @@ Denoted in browser log entry as `"SOURCE": "type"`. BROWSER_LOG_BLACKLIST=other,console-api ``` +### WAIT_TIMEOUT + +Global MFTF configuration for the default amount of time (in seconds) that a test will wait while loading a page. + +```conf +WAIT_TIMEOUT=30 +``` + [`MAGENTO_CLI_COMMAND_PATH`]: #magento_cli_command_path diff --git a/src/Magento/FunctionalTestingFramework/_bootstrap.php b/src/Magento/FunctionalTestingFramework/_bootstrap.php index 490ff61de..ebc62e95d 100644 --- a/src/Magento/FunctionalTestingFramework/_bootstrap.php +++ b/src/Magento/FunctionalTestingFramework/_bootstrap.php @@ -50,8 +50,8 @@ defined('DEFAULT_TIMEZONE') || define('DEFAULT_TIMEZONE', 'America/Los_Angeles'); $env->setEnvironmentVariable('DEFAULT_TIMEZONE', DEFAULT_TIMEZONE); - defined('WAIT_TIMEOUT') || define('WAIT_TIMEOUT', 10); - $env->setEnvironmentVariable('WAIT_TIMEOUT', 10); + defined('WAIT_TIMEOUT') || define('WAIT_TIMEOUT', 30); + $env->setEnvironmentVariable('WAIT_TIMEOUT', 30); try { new DateTimeZone(DEFAULT_TIMEZONE); From 8f72ffc123da6a0a1b7868ba2468f05c580f2ce2 Mon Sep 17 00:00:00 2001 From: Soumya Unnikrishnan Date: Mon, 25 Nov 2019 11:21:00 -0600 Subject: [PATCH 4/4] MQE-1520: Consolidate WAIT_TIMEOUT in .env and pageload_timeout Updated .env.example --- etc/config/.env.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/config/.env.example b/etc/config/.env.example index bb1d1ad63..e290c7815 100644 --- a/etc/config/.env.example +++ b/etc/config/.env.example @@ -53,7 +53,7 @@ MODULE_WHITELIST=Magento_Framework,ConfigurableProductWishlist,ConfigurableProdu #ALLOW_SKIPPED=true #*** Default timeout for wait actions -#WAIT_TIMEOUT=10 +#WAIT_TIMEOUT=30 #*** Uncomment and set to enable browser log entries on actions in Allure. Blacklist is used to filter logs of a specific "source" #ENABLE_BROWSER_LOG=true