From a1c4ee1787a5c2a0149aa6b8734533f960d21e78 Mon Sep 17 00:00:00 2001 From: vdelendik Date: Thu, 9 Jun 2022 16:16:12 +0300 Subject: [PATCH] reverted changes for #1705 to experiment later --- .../core/foundation/webdriver/DriverHelper.java | 13 +++++++------ .../core/foundation/webdriver/Screenshot.java | 13 +++++++------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/carina-webdriver/src/main/java/com/qaprosoft/carina/core/foundation/webdriver/DriverHelper.java b/carina-webdriver/src/main/java/com/qaprosoft/carina/core/foundation/webdriver/DriverHelper.java index 1b7650bba8..422d4d3669 100644 --- a/carina-webdriver/src/main/java/com/qaprosoft/carina/core/foundation/webdriver/DriverHelper.java +++ b/carina-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/carina-webdriver/src/main/java/com/qaprosoft/carina/core/foundation/webdriver/Screenshot.java b/carina-webdriver/src/main/java/com/qaprosoft/carina/core/foundation/webdriver/Screenshot.java index 159f80a01b..c86d5f3607 100644 --- a/carina-webdriver/src/main/java/com/qaprosoft/carina/core/foundation/webdriver/Screenshot.java +++ b/carina-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; }