Skip to content

Commit 9e7ce0d

Browse files
committed
MQE-1711: Switch between Developer mode and Production mode takes long time and the test end up time out
Resolved conflicts.
2 parents aa3f758 + 4bbcab4 commit 9e7ce0d

File tree

7 files changed

+20
-5
lines changed

7 files changed

+20
-5
lines changed

dev/tests/_bootstrap.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@
4545
'MAGENTO_BACKEND_NAME' => 'admin',
4646
'MAGENTO_ADMIN_USERNAME' => 'admin',
4747
'MAGENTO_ADMIN_PASSWORD' => 'admin123',
48-
'DEFAULT_TIMEZONE' => 'America/Los_Angeles'
48+
'DEFAULT_TIMEZONE' => 'America/Los_Angeles',
49+
'WAIT_TIMEOUT' => '10'
4950
];
5051

5152
foreach ($TEST_ENVS as $key => $value) {

dev/tests/functional/standalone_bootstrap.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,10 @@
4949

5050
defined('DEFAULT_TIMEZONE') || define('DEFAULT_TIMEZONE', 'America/Los_Angeles');
5151
$env->setEnvironmentVariable('DEFAULT_TIMEZONE', DEFAULT_TIMEZONE);
52-
52+
53+
defined('WAIT_TIMEOUT') || define('WAIT_TIMEOUT', 30);
54+
$env->setEnvironmentVariable('WAIT_TIMEOUT', 30);
55+
5356
try {
5457
new DateTimeZone(DEFAULT_TIMEZONE);
5558
} catch (\Exception $e) {

docs/configuration.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,14 @@ Denoted in browser log entry as `"SOURCE": "type"`.
295295
BROWSER_LOG_BLACKLIST=other,console-api
296296
```
297297

298+
### WAIT_TIMEOUT
299+
300+
Global MFTF configuration for the default amount of time (in seconds) that a test will wait while loading a page.
301+
302+
```conf
303+
WAIT_TIMEOUT=30
304+
```
305+
298306
<!-- Link definitions -->
299307

300308
[`MAGENTO_CLI_COMMAND_PATH`]: #magento_cli_command_path

etc/config/.env.example

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ MODULE_WHITELIST=Magento_Framework,ConfigurableProductWishlist,ConfigurableProdu
5353
#ALLOW_SKIPPED=true
5454

5555
#*** Default timeout for wait actions
56-
#WAIT_TIMEOUT=10
56+
#WAIT_TIMEOUT=30
5757

5858
#*** Uncomment and set to enable browser log entries on actions in Allure. Blacklist is used to filter logs of a specific "source"
5959
#ENABLE_BROWSER_LOG=true

etc/config/functional.suite.dist.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ modules:
2727
window_size: 1280x1024
2828
username: "%MAGENTO_ADMIN_USERNAME%"
2929
password: "%MAGENTO_ADMIN_PASSWORD%"
30-
pageload_timeout: 30
30+
pageload_timeout: "%WAIT_TIMEOUT%"
3131
host: "%SELENIUM_HOST%"
3232
port: "%SELENIUM_PORT%"
3333
protocol: "%SELENIUM_PROTOCOL%"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ public function __construct(
169169
*/
170170
public static function getDefaultWaitTimeout()
171171
{
172-
return getenv('WAIT_TIMEOUT') ?: self::DEFAULT_WAIT_TIMEOUT;
172+
return getenv('WAIT_TIMEOUT');
173173
}
174174

175175
/**

src/Magento/FunctionalTestingFramework/_bootstrap.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@
5050
defined('DEFAULT_TIMEZONE') || define('DEFAULT_TIMEZONE', 'America/Los_Angeles');
5151
$env->setEnvironmentVariable('DEFAULT_TIMEZONE', DEFAULT_TIMEZONE);
5252

53+
defined('WAIT_TIMEOUT') || define('WAIT_TIMEOUT', 30);
54+
$env->setEnvironmentVariable('WAIT_TIMEOUT', 30);
55+
5356
try {
5457
new DateTimeZone(DEFAULT_TIMEZONE);
5558
} catch (\Exception $e) {

0 commit comments

Comments
 (0)