Merge pull request #107 from lbajsarowicz/develop

FIX: Timeout running MFTF tests
wardenenv · Feb 25, 2020 · de2b2c0 · de2b2c0
2 parents e7eb3bd + 98d71a6
commit de2b2c0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@
 
 * Updated environment path (`WARDEN_ENV_PATH` in scripts) to use physical vs logical current working directory to resolve issues with using symlinked file paths (issue [#101](https://github.com/davidalger/warden/issues/101))
 * Removed confusingly quoted placeholder values related to Blackfire from env file generated by `env-init`
+* Removed timeout for Selenium Hub, increased timeout for MFTF's `command.php` endpoint to 10 minutes
 
 ## Version [0.2.3](https://github.com/davidalger/warden/tree/0.2.3) (2020-02-14)
 [All Commits](https://github.com/davidalger/warden/compare/0.2.2..0.2.3)

diff --git a/environments/magento2.selenium.base.yml b/environments/magento2.selenium.base.yml
@@ -4,6 +4,9 @@ services:
     container_name: ${WARDEN_ENV_NAME}_selenium-hub
     hostname: selenium-hub
     image: selenium/hub:3.8.1
+    environment:
+      GRID_TIMEOUT: 0
+      GRID_BROWSER_TIMEOUT: 0
     networks:
       - warden
       - default

diff --git a/images/nginx/context/etc/nginx/available.d/magento2.conf b/images/nginx/context/etc/nginx/available.d/magento2.conf
@@ -128,11 +128,14 @@ location /media/import/ {
 location ~* ^/dev/tests/acceptance/utils($|/) {
     root $MAGE_ROOT;
 
+    # This endpoint runs `bin/magento` CLI, be aware that it needs more time to finish
     location ~ ^/dev/tests/acceptance/utils/command.php {
         fastcgi_pass   $fastcgi_backend;
         fastcgi_index  index.php;
         fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
         fastcgi_param  PATH_INFO        $fastcgi_path_info;
+        fastcgi_read_timeout 600s;
+        fastcgi_connect_timeout 600s;
         include        fastcgi_params;
     }
 }