Merge branch 'trunk' into Fix15697-5

Author: rpallavisharma

dotnet/src/webdriver/Proxy.cs

@@ -72,7 +72,6 @@ public class Proxy
 {
     private ProxyKind proxyKind = ProxyKind.Unspecified;
     private bool isAutoDetect;
-    private string? ftpProxyLocation;
     private string? httpProxyLocation;
     private string? proxyAutoConfigUrl;
     private string? sslProxyLocation;
@@ -116,11 +115,6 @@ public Proxy(Dictionary<string, object> settings)
             }
         }
 
-        if (settings.TryGetValue("ftpProxy", out object? ftpProxyObj) && ftpProxyObj?.ToString() is string ftpProxy)
-        {
-            this.FtpProxy = ftpProxy;
-        }
-
         if (settings.TryGetValue("httpProxy", out object? httpProxyObj) && httpProxyObj?.ToString() is string httpProxy)
         {
             this.HttpProxy = httpProxy;
@@ -236,24 +230,6 @@ public bool IsAutoDetect
         }
     }
 
-    /// <summary>
-    /// Gets or sets the value of the proxy for the FTP protocol.
-    /// </summary>
-    [JsonPropertyName("ftpProxy")]
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
-    [Obsolete("FTP proxy support is deprecated and will be removed in the 4.37 version.")]
-    public string? FtpProxy
-    {
-        get => this.ftpProxyLocation;
-
-        set
-        {
-            this.VerifyProxyTypeCompatilibily(ProxyKind.Manual);
-            this.proxyKind = ProxyKind.Manual;
-            this.ftpProxyLocation = value;
-        }
-    }
-
     /// <summary>
     /// Gets or sets the value of the proxy for the HTTP protocol.
     /// </summary>
@@ -494,11 +470,6 @@ public void AddBypassAddresses(IEnumerable<string> addressesToAdd)
                 serializedDictionary["sslProxy"] = this.sslProxyLocation;
             }
 
-            if (!string.IsNullOrEmpty(this.ftpProxyLocation))
-            {
-                serializedDictionary["ftpProxy"] = this.ftpProxyLocation;
-            }
-
             if (!string.IsNullOrEmpty(this.socksProxyLocation))
             {
                 if (!this.socksVersion.HasValue)

dotnet/test/common/ProxyTest.cs

@@ -31,7 +31,6 @@ public void NotInitializedProxy()
         Proxy proxy = new Proxy();
 
         Assert.That(proxy.Kind, Is.EqualTo(ProxyKind.Unspecified));
-        Assert.That(proxy.FtpProxy, Is.Null);
         Assert.That(proxy.HttpProxy, Is.Null);
         Assert.That(proxy.SslProxy, Is.Null);
         Assert.That(proxy.SocksProxy, Is.Null);
@@ -54,7 +53,6 @@ public void CanNotChangeAlreadyInitializedProxyType()
         Assert.That(() => proxy.SocksUserName = "", Throws.InvalidOperationException);
         Assert.That(() => proxy.SocksProxy = "", Throws.InvalidOperationException);
         Assert.That(() => proxy.SocksVersion = 5, Throws.InvalidOperationException);
-        Assert.That(() => proxy.FtpProxy = "", Throws.InvalidOperationException);
         Assert.That(() => proxy.HttpProxy = "", Throws.InvalidOperationException);
         Assert.That(() => proxy.SslProxy = "", Throws.InvalidOperationException);
         Assert.That(() => proxy.ProxyAutoConfigUrl = "", Throws.InvalidOperationException);
@@ -73,7 +71,6 @@ public void ManualProxy()
         Proxy proxy = new Proxy();
 
         proxy.HttpProxy = "http.proxy:1234";
-        proxy.FtpProxy = "ftp.proxy";
         proxy.SslProxy = "ssl.proxy";
         proxy.AddBypassAddresses("localhost", "127.0.0.*");
         proxy.SocksProxy = "socks.proxy:65555";
@@ -82,7 +79,6 @@ public void ManualProxy()
         proxy.SocksPassword = "test2";
 
         Assert.That(proxy.Kind, Is.EqualTo(ProxyKind.Manual));
-        Assert.That(proxy.FtpProxy, Is.EqualTo("ftp.proxy"));
         Assert.That(proxy.HttpProxy, Is.EqualTo("http.proxy:1234"));
         Assert.That(proxy.SslProxy, Is.EqualTo("ssl.proxy"));
         Assert.That(proxy.SocksProxy, Is.EqualTo("socks.proxy:65555"));
@@ -104,7 +100,6 @@ public void PACProxy()
         Assert.That(proxy.Kind, Is.EqualTo(ProxyKind.ProxyAutoConfigure));
         Assert.That(proxy.ProxyAutoConfigUrl, Is.EqualTo("http://aaa/bbb.pac"));
 
-        Assert.That(proxy.FtpProxy, Is.Null);
         Assert.That(proxy.HttpProxy, Is.Null);
         Assert.That(proxy.SslProxy, Is.Null);
         Assert.That(proxy.SocksProxy, Is.Null);
@@ -124,7 +119,6 @@ public void AutoDetectProxy()
         Assert.That(proxy.Kind, Is.EqualTo(ProxyKind.AutoDetect));
         Assert.That(proxy.IsAutoDetect, Is.True);
 
-        Assert.That(proxy.FtpProxy, Is.Null);
         Assert.That(proxy.HttpProxy, Is.Null);
         Assert.That(proxy.SslProxy, Is.Null);
         Assert.That(proxy.SocksProxy, Is.Null);
@@ -153,7 +147,6 @@ public void ManualProxyFromDictionary()
         Proxy proxy = new Proxy(proxyData);
 
         Assert.That(proxy.Kind, Is.EqualTo(ProxyKind.Manual));
-        Assert.That(proxy.FtpProxy, Is.EqualTo("ftp.proxy"));
         Assert.That(proxy.HttpProxy, Is.EqualTo("http.proxy:1234"));
         Assert.That(proxy.SslProxy, Is.EqualTo("ssl.proxy"));
         Assert.That(proxy.SocksProxy, Is.EqualTo("socks.proxy:65555"));
@@ -199,7 +192,6 @@ public void PacProxyFromDictionary()
         Assert.That(proxy.Kind, Is.EqualTo(ProxyKind.ProxyAutoConfigure));
         Assert.That(proxy.ProxyAutoConfigUrl, Is.EqualTo("http://aaa/bbb.pac"));
 
-        Assert.That(proxy.FtpProxy, Is.Null);
         Assert.That(proxy.HttpProxy, Is.Null);
         Assert.That(proxy.SslProxy, Is.Null);
         Assert.That(proxy.SocksProxy, Is.Null);
@@ -222,7 +214,6 @@ public void AutoDetectProxyFromDictionary()
         Assert.That(proxy.Kind, Is.EqualTo(ProxyKind.AutoDetect));
         Assert.That(proxy.IsAutoDetect, Is.True);
 
-        Assert.That(proxy.FtpProxy, Is.Null);
         Assert.That(proxy.HttpProxy, Is.Null);
         Assert.That(proxy.SslProxy, Is.Null);
         Assert.That(proxy.SocksProxy, Is.Null);
@@ -243,7 +234,6 @@ public void SystemProxyFromDictionary()
 
         Assert.That(proxy.Kind, Is.EqualTo(ProxyKind.System));
 
-        Assert.That(proxy.FtpProxy, Is.Null);
         Assert.That(proxy.HttpProxy, Is.Null);
         Assert.That(proxy.SslProxy, Is.Null);
         Assert.That(proxy.SocksProxy, Is.Null);
@@ -265,7 +255,6 @@ public void DirectProxyFromDictionary()
 
         Assert.That(proxy.Kind, Is.EqualTo(ProxyKind.Direct));
 
-        Assert.That(proxy.FtpProxy, Is.Null);
         Assert.That(proxy.HttpProxy, Is.Null);
         Assert.That(proxy.SslProxy, Is.Null);
         Assert.That(proxy.SocksProxy, Is.Null);
@@ -281,13 +270,11 @@ public void DirectProxyFromDictionary()
     public void ConstructingWithNullKeysWorksAsExpected()
     {
         Dictionary<string, object> rawProxy = new Dictionary<string, object>();
-        rawProxy.Add("ftpProxy", null);
         rawProxy.Add("httpProxy", "http://www.example.com");
         rawProxy.Add("autodetect", null);
 
         Proxy proxy = new Proxy(rawProxy);
 
-        Assert.That(proxy.FtpProxy, Is.Null);
         Assert.That(proxy.IsAutoDetect, Is.False);
         Assert.That(proxy.HttpProxy, Is.EqualTo("http://www.example.com"));
     }

java/src/org/openqa/selenium/remote/RemoteWebDriver.java

@@ -572,10 +572,14 @@ protected Response execute(CommandPayload payload) {
         if (e instanceof SessionNotCreatedException) {
           toThrow = (WebDriverException) e;
         } else {
+          // When this exception comes from a remote end, the real cause is usually hidden in the
+          // cause. Let's try to rescue it and display it at the top level.
+          String cause = e.getCause() != null ? " " + e.getCause().getMessage() : "";
           toThrow =
               new SessionNotCreatedException(
                   "Possible causes are invalid address of the remote server or browser start-up"
-                      + " failure.",
+                      + " failure."
+                      + cause,
                   e);
         }
       } else if (e instanceof WebDriverException) {

py/conftest.py

@@ -489,6 +489,10 @@ def firefox_options(request):
     except (AttributeError, TypeError):
         raise Exception("This test requires a --driver to be specified")
 
+    # skip if not Firefox or Remote
+    if driver_class not in ("firefox", "remote"):
+        pytest.skip(f"This test requires Firefox or Remote. Got {driver_class}")
+
     # skip tests in the 'remote' directory if run with a local driver
     if request.node.path.parts[-2] == "remote" and getattr(_supported_drivers, driver_class) != "Remote":
         pytest.skip(f"Remote tests can't be run with driver '{driver_class}'")
@@ -506,15 +510,17 @@ def chromium_options(request):
     except (AttributeError, TypeError):
         raise Exception("This test requires a --driver to be specified")
 
-    # Skip if not Chrome or Edge
-    if driver_class not in ("chrome", "edge"):
-        pytest.skip(f"This test requires Chrome or Edge, got {driver_class}")
+    # skip if not Chrome, Edge, or Remote
+    if driver_class not in ("chrome", "edge", "remote"):
+        pytest.skip(f"This test requires Chrome, Edge, or Remote. Got {driver_class}")
 
     # skip tests in the 'remote' directory if run with a local driver
     if request.node.path.parts[-2] == "remote" and getattr(_supported_drivers, driver_class) != "Remote":
         pytest.skip(f"Remote tests can't be run with driver '{driver_class}'")
 
-    if driver_class in ("chrome", "edge"):
-        options = Driver.clean_options(driver_class, request)
+    if driver_class in ("chrome", "remote"):
+        options = Driver.clean_options("chrome", request)
+    else:
+        options = Driver.clean_options("edge", request)
 
     return options

py/selenium/webdriver/remote/client_config.py

@@ -50,22 +50,19 @@ class ClientConfig:
     keep_alive = _ClientConfigDescriptor("_keep_alive")
     """Gets and Sets Keep Alive value."""
     proxy = _ClientConfigDescriptor("_proxy")
-    """Gets and Sets the proxy used for communicating to the driver/server."""
+    """Gets and Sets the proxy used for communicating with the driver/server."""
     ignore_certificates = _ClientConfigDescriptor("_ignore_certificates")
     """Gets and Sets the ignore certificate check value."""
     init_args_for_pool_manager = _ClientConfigDescriptor("_init_args_for_pool_manager")
     """Gets and Sets the ignore certificate check."""
     timeout = _ClientConfigDescriptor("_timeout")
-    """Gets and Sets the timeout (in seconds) used for communicating to the
-    driver/server."""
+    """Gets and Sets the timeout (in seconds) used for communicating with the driver/server."""
     ca_certs = _ClientConfigDescriptor("_ca_certs")
     """Gets and Sets the path to bundle of CA certificates."""
     username = _ClientConfigDescriptor("_username")
-    """Gets and Sets the username used for basic authentication to the
-    remote."""
+    """Gets and Sets the username used for basic authentication to the remote."""
     password = _ClientConfigDescriptor("_password")
-    """Gets and Sets the password used for basic authentication to the
-    remote."""
+    """Gets and Sets the password used for basic authentication to the remote."""
     auth_type = _ClientConfigDescriptor("_auth_type")
     """Gets and Sets the type of authentication to the remote server."""
     token = _ClientConfigDescriptor("_token")
@@ -74,6 +71,10 @@ class ClientConfig:
     """Gets and Sets user agent to be added to the request headers."""
     extra_headers = _ClientConfigDescriptor("_extra_headers")
     """Gets and Sets extra headers to be added to the request."""
+    websocket_timeout = _ClientConfigDescriptor("_websocket_timeout")
+    """Gets and Sets the WebSocket response wait timeout (in seconds) used for communicating with the browser."""
+    websocket_interval = _ClientConfigDescriptor("_websocket_interval")
+    """Gets and Sets the WebSocket response wait interval (in seconds) used for communicating with the browser."""
 
     def __init__(
         self,
@@ -90,6 +91,8 @@ def __init__(
         token: Optional[str] = None,
         user_agent: Optional[str] = None,
         extra_headers: Optional[dict] = None,
+        websocket_timeout: Optional[float] = 30.0,
+        websocket_interval: Optional[float] = 0.1,
     ) -> None:
         self.remote_server_addr = remote_server_addr
         self.keep_alive = keep_alive
@@ -103,6 +106,8 @@ def __init__(
         self.token = token
         self.user_agent = user_agent
         self.extra_headers = extra_headers
+        self.websocket_timeout = websocket_timeout
+        self.websocket_interval = websocket_interval
 
         self.ca_certs = (
             (os.getenv("REQUESTS_CA_BUNDLE") if "REQUESTS_CA_BUNDLE" in os.environ else certifi.where())

py/selenium/webdriver/remote/webdriver.py

@@ -1211,7 +1211,11 @@ def start_devtools(self):
             return self._devtools, self._websocket_connection
         if self.caps["browserName"].lower() == "firefox":
             raise RuntimeError("CDP support for Firefox has been removed. Please switch to WebDriver BiDi.")
-        self._websocket_connection = WebSocketConnection(ws_url)
+        self._websocket_connection = WebSocketConnection(
+            ws_url,
+            self.command_executor.client_config.websocket_timeout,
+            self.command_executor.client_config.websocket_interval,
+        )
         targets = self._websocket_connection.execute(self._devtools.target.get_targets())
         for target in targets:
             if target.target_id == self.current_window_handle:
@@ -1260,7 +1264,11 @@ def _start_bidi(self):
         else:
             raise WebDriverException("Unable to find url to connect to from capabilities")
 
-        self._websocket_connection = WebSocketConnection(ws_url)
+        self._websocket_connection = WebSocketConnection(
+            ws_url,
+            self.command_executor.client_config.websocket_timeout,
+            self.command_executor.client_config.websocket_interval,
+        )
 
     @property
     def network(self):

py/selenium/webdriver/remote/websocket_connection.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+
 import json
 import logging
 from ssl import CERT_NONE
@@ -28,16 +29,20 @@
 
 
 class WebSocketConnection:
-    _response_wait_timeout = 30
-    _response_wait_interval = 0.1
-
     _max_log_message_size = 9999
 
-    def __init__(self, url):
-        self.callbacks = {}
-        self.session_id = None
+    def __init__(self, url, timeout, interval):
+        if not isinstance(timeout, (int, float)) or timeout < 0:
+            raise WebDriverException("timeout must be a positive number")
+        if not isinstance(interval, (int, float)) or timeout < 0:
+            raise WebDriverException("interval must be a positive number")
+
         self.url = url
+        self.response_wait_timeout = timeout
+        self.response_wait_interval = interval
 
+        self.callbacks = {}
+        self.session_id = None
         self._id = 0
         self._messages = {}
         self._started = False
@@ -46,7 +51,7 @@ def __init__(self, url):
         self._wait_until(lambda: self._started)
 
     def close(self):
-        self._ws_thread.join(timeout=self._response_wait_timeout)
+        self._ws_thread.join(timeout=self.response_wait_timeout)
         self._ws.close()
         self._started = False
         self._ws = None
@@ -142,8 +147,8 @@ def _process_message(self, message):
                 Thread(target=callback, args=(params,)).start()
 
     def _wait_until(self, condition):
-        timeout = self._response_wait_timeout
-        interval = self._response_wait_interval
+        timeout = self.response_wait_timeout
+        interval = self.response_wait_interval
 
         while timeout > 0:
             result = condition()