Merge branch 'trunk' into py-use-chrome-for-remote-tests

Author: cgoldberg

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/test/selenium/webdriver/common/bidi_network_tests.py

@@ -73,14 +73,20 @@ def callback(request: Request):
 
 
 def test_continue_request(driver, pages):
+    exceptions = []
+
     def callback(request: Request):
-        request.continue_request()
+        try:
+            request.continue_request()
+        except WebDriverException as e:
+            exceptions.append(e)
 
     callback_id = driver.network.add_request_handler("before_request", callback)
     assert callback_id is not None, "Request handler not added"
     url = pages.url("formPage.html")
     driver.browsing_context.navigate(context=driver.current_window_handle, url=url, wait=ReadinessState.COMPLETE)
     assert driver.find_element(By.NAME, "login").is_displayed(), "Request not continued"
+    assert len(exceptions) == 0, "Exception raised when continuing request in handler callback"
 
 
 def test_continue_with_auth(driver):
@@ -99,6 +105,26 @@ def test_remove_auth_handler(driver):
     assert driver.network.intercepts == [], "Intercept not removed"
 
 
+def test_handler_with_classic_navigation(driver, pages):
+    """Verify request handlers also work with classic navigation."""
+    browser_name = driver.caps["browserName"]
+    if browser_name.lower() in ("chrome", "microsoftedge"):
+        pytest.skip(reason=f"Request handlers don't yet work in {browser_name} using classic navigation")
+
+    exceptions = []
+
+    def callback(request: Request):
+        try:
+            request.continue_request()
+        except WebDriverException as e:
+            exceptions.append(e)
+
+    callback_id = driver.network.add_request_handler("before_request", callback)
+    assert callback_id is not None, "Request handler not added"
+    pages.load("formPage.html")
+    assert len(exceptions) == 0, "Exception raised in handler callback"
+
+
 @pytest.mark.xfail_chrome(reason="Data URLs in Network requests are not implemented in Chrome yet")
 @pytest.mark.xfail_edge(reason="Data URLs in Network requests are not implemented in Edge yet")
 @pytest.mark.xfail_firefox(reason="Data URLs in Network requests are not implemented in Firefox yet")
@@ -120,4 +146,4 @@ def callback(request: Request):
     time.sleep(1)  # give callback time to complete
     assert driver.find_element(By.ID, "data-url-image").is_displayed()
     assert len(data_requests) > 0, "BiDi event not captured"
-    assert len(exceptions) == 0, "Exception raised when continuing request in callback"
+    assert len(exceptions) == 0, "Exception raised when continuing request in handler callback"