reverted changes for #1705 to experiment later

zebrunner · Jun 9, 2022 · a1c4ee1 · a1c4ee1
1 parent 47cf701
commit a1c4ee1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/...-webdriver/src/main/java/com/qaprosoft/carina/core/foundation/webdriver/DriverHelper.java b/...-webdriver/src/main/java/com/qaprosoft/carina/core/foundation/webdriver/DriverHelper.java
@@ -1297,12 +1297,13 @@ private String getUrl() {
 
     private long getPageLoadTimeout() {
         long timeout = 300;
-        if (!R.CONFIG.get("capabilities.idleTimeout").isEmpty()) {
-            long idleTimeout = R.CONFIG.getLong("capabilities.idleTimeout");
-            if (idleTimeout < timeout) {
-                timeout = idleTimeout;
-            }
-        }
+        // #1705: limit pageLoadTimeout driver timeout by idleTimeout
+//        if (!R.CONFIG.get("capabilities.idleTimeout").isEmpty()) {
+//            long idleTimeout = R.CONFIG.getLong("capabilities.idleTimeout");
+//            if (idleTimeout < timeout) {
+//                timeout = idleTimeout;
+//            }
+//        }
         return timeout;
     }
 

diff --git a/...na-webdriver/src/main/java/com/qaprosoft/carina/core/foundation/webdriver/Screenshot.java b/...na-webdriver/src/main/java/com/qaprosoft/carina/core/foundation/webdriver/Screenshot.java
@@ -755,12 +755,13 @@ private static WebDriver castDriver(WebDriver drv) {
 
     private static long getPageLoadTimeout() {
         long timeout = 300;
-        if (!R.CONFIG.get("capabilities.idleTimeout").isEmpty()) {
-            long idleTimeout = R.CONFIG.getLong("capabilities.idleTimeout");
-            if (idleTimeout < timeout) {
-                timeout = idleTimeout;
-            }
-        }
+        // #1705: limit pageLoadTimeout driver timeout by idleTimeout
+//      if (!R.CONFIG.get("capabilities.idleTimeout").isEmpty()) {
+//          long idleTimeout = R.CONFIG.getLong("capabilities.idleTimeout");
+//          if (idleTimeout < timeout) {
+//              timeout = idleTimeout;
+//          }
+//      }
         return timeout;
     }