Merge branch 'trunk' into bidi_add_authentication_handler

aguspe · web-flow · commit 3b8573b4dca3 · 2024-11-04T18:34:14.000+01:00
diff --git a/.github/workflows/ci-python.yml b/.github/workflows/ci-python.yml
@@ -96,5 +96,4 @@ jobs:
       browser: safari
       os: macos
       cache-key: py-safari
-      run: |
-        bazel test --local_test_jobs 1 --flaky_test_attempts 3 //py:test-safari-test/selenium/webdriver/safari/launcher_tests.py
+      run: bazel test --local_test_jobs 1 --flaky_test_attempts 3 //py:test-safari
diff --git a/java/src/org/openqa/selenium/grid/node/ForwardWebDriverCommand.java b/java/src/org/openqa/selenium/grid/node/ForwardWebDriverCommand.java
@@ -17,11 +17,11 @@
 
 package org.openqa.selenium.grid.node;
 
-import static java.net.HttpURLConnection.HTTP_INTERNAL_ERROR;
+import static java.net.HttpURLConnection.HTTP_NOT_FOUND;
 import static org.openqa.selenium.remote.HttpSessionId.getSessionId;
 import static org.openqa.selenium.remote.http.Contents.asJson;
 
-import com.google.common.collect.ImmutableMap;
+import java.util.Map;
 import org.openqa.selenium.internal.Require;
 import org.openqa.selenium.remote.SessionId;
 import org.openqa.selenium.remote.http.HttpHandler;
@@ -48,10 +48,16 @@ public HttpResponse execute(HttpRequest req) {
       return node.executeWebDriverCommand(req);
     }
     return new HttpResponse()
-        .setStatus(HTTP_INTERNAL_ERROR)
+        .setStatus(HTTP_NOT_FOUND)
         .setContent(
             asJson(
-                ImmutableMap.of(
-                    "error", String.format("Session not found in node %s", node.getId()))));
+                Map.of(
+                    "value",
+                    Map.of(
+                        "error", "invalid session id",
+                        "message",
+                            "Cannot find session with id: "
+                                + getSessionId(req.getUri()).orElse(null),
+                        "stacktrace", ""))));
   }
 }
diff --git a/java/src/org/openqa/selenium/grid/node/Node.java b/java/src/org/openqa/selenium/grid/node/Node.java
@@ -154,12 +154,7 @@ protected Node(
         combine(
             // "getSessionId" is aggressive about finding session ids, so this needs to be the last
             // route that is checked.
-            matching(
-                    req ->
-                        getSessionId(req.getUri())
-                            .map(SessionId::new)
-                            .map(sessionId -> this.getSession(sessionId) != null)
-                            .orElse(false))
+            matching(req -> getSessionId(req.getUri()).map(SessionId::new).isPresent())
                 .to(() -> new ForwardWebDriverCommand(this))
                 .with(spanDecorator("node.forward_command")),
             new CustomLocatorHandler(this, registrationSecret, customLocators),
diff --git a/java/src/org/openqa/selenium/netty/server/RequestConverter.java b/java/src/org/openqa/selenium/netty/server/RequestConverter.java
@@ -96,7 +96,7 @@ protected void channelRead0(ChannelHandlerContext ctx, HttpObject msg) throws Ex
       length = -1;
     }
 
-    if (msg instanceof HttpContent) {
+    if (request != null && msg instanceof HttpContent) {
       ByteBuf buf = ((HttpContent) msg).content().retain();
       int nBytes = buf.readableBytes();
 
diff --git a/java/test/org/openqa/selenium/grid/node/ForwardWebDriverCommandTest.java b/java/test/org/openqa/selenium/grid/node/ForwardWebDriverCommandTest.java
@@ -17,12 +17,12 @@
 
 package org.openqa.selenium.grid.node;
 
-import static java.net.HttpURLConnection.HTTP_INTERNAL_ERROR;
+import static java.net.HttpURLConnection.HTTP_NOT_FOUND;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.*;
 import static org.openqa.selenium.remote.http.Contents.asJson;
 
-import com.google.common.collect.ImmutableMap;
+import java.util.Map;
 import java.util.UUID;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -69,11 +69,18 @@ void testExecuteWithInvalidSessionOwner() {
     HttpResponse actualResponse = command.execute(mockRequest);
     HttpResponse expectResponse =
         new HttpResponse()
-            .setStatus(HTTP_INTERNAL_ERROR)
+            .setStatus(HTTP_NOT_FOUND)
             .setContent(
                 asJson(
-                    ImmutableMap.of(
-                        "error", String.format("Session not found in node %s", mockNode.getId()))));
+                    Map.of(
+                        "value",
+                        Map.of(
+                            "error",
+                            "invalid session id",
+                            "message",
+                            "Cannot find session with id: " + sessionId,
+                            "stacktrace",
+                            ""))));
     assertEquals(expectResponse.getStatus(), actualResponse.getStatus());
     assertEquals(expectResponse.getContentEncoding(), actualResponse.getContentEncoding());
   }
diff --git a/java/test/org/openqa/selenium/grid/router/StressTest.java b/java/test/org/openqa/selenium/grid/router/StressTest.java
@@ -77,6 +77,11 @@ public void setupServers() {
                         + "\n"
                         + "session-timeout = 11"
                         + "\n"
+                        + "overwrite-max-sessions = true"
+                        + "\n"
+                        + "max-sessions = "
+                        + Runtime.getRuntime().availableProcessors() * 2
+                        + "\n"
                         + "enable-managed-downloads = true")));
     tearDowns.add(deployment);
 
diff --git a/py/selenium/webdriver/remote/webelement.py b/py/selenium/webdriver/remote/webelement.py
@@ -173,6 +173,13 @@ def get_attribute(self, name) -> str | None:
             # Check if the "active" CSS class is applied to an element.
             is_active = "active" in target_element.get_attribute("class")
         """
+
+        warnings.warn(
+            "using WebElement.get_attribute() has been deprecated. Please use get_dom_attribute() instead.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+
         if getAttribute_js is None:
             _load_js()
         attribute_value = self.parent.execute_script(
diff --git a/py/test/selenium/webdriver/common/alerts_tests.py b/py/test/selenium/webdriver/common/alerts_tests.py
@@ -294,6 +294,7 @@ def test_alert_should_not_allow_additional_commands_if_dismissed(driver, pages):
 @pytest.mark.xfail_remote(reason="https://bugzilla.mozilla.org/show_bug.cgi?id=1279211")
 @pytest.mark.xfail_chrome
 @pytest.mark.xfail_edge
+@pytest.mark.xfail_safari
 def test_unexpected_alert_present_exception_contains_alert_text(driver, pages):
     pages.load("alerts.html")
     driver.find_element(by=By.ID, value="alert").click()
diff --git a/py/test/selenium/webdriver/common/api_example_tests.py b/py/test/selenium/webdriver/common/api_example_tests.py
@@ -240,6 +240,7 @@ def test_is_element_displayed(driver, pages):
 
 
 @pytest.mark.xfail_chrome
+@pytest.mark.xfail_safari
 def test_move_window_position(driver, pages):
     pages.load("blank.html")
     loc = driver.get_window_position()
diff --git a/py/test/selenium/webdriver/common/interactions_tests.py b/py/test/selenium/webdriver/common/interactions_tests.py
@@ -253,6 +253,7 @@ def test_can_pause(driver, pages):
 
 @pytest.mark.xfail_firefox
 @pytest.mark.xfail_remote
+@pytest.mark.xfail_safari
 def test_can_scroll_to_element(driver, pages):
     pages.load("scrolling_tests/frame_with_nested_scrolling_frame_out_of_view.html")
     iframe = driver.find_element(By.TAG_NAME, "iframe")
@@ -266,6 +267,7 @@ def test_can_scroll_to_element(driver, pages):
 
 @pytest.mark.xfail_firefox
 @pytest.mark.xfail_remote
+@pytest.mark.xfail_safari
 def test_can_scroll_from_element_by_amount(driver, pages):
     pages.load("scrolling_tests/frame_with_nested_scrolling_frame_out_of_view.html")
     iframe = driver.find_element(By.TAG_NAME, "iframe")
@@ -280,6 +282,7 @@ def test_can_scroll_from_element_by_amount(driver, pages):
 
 @pytest.mark.xfail_firefox
 @pytest.mark.xfail_remote
+@pytest.mark.xfail_safari
 def test_can_scroll_from_element_with_offset_by_amount(driver, pages):
     pages.load("scrolling_tests/frame_with_nested_scrolling_frame_out_of_view.html")
     footer = driver.find_element(By.TAG_NAME, "footer")
@@ -314,6 +317,7 @@ def test_can_scroll_from_viewport_by_amount(driver, pages):
     assert _in_viewport(driver, footer)
 
 
+@pytest.mark.xfail_safari
 def test_can_scroll_from_viewport_with_offset_by_amount(driver, pages):
     pages.load("scrolling_tests/frame_with_nested_scrolling_frame.html")
     scroll_origin = ScrollOrigin.from_viewport(10, 10)
diff --git a/py/test/selenium/webdriver/common/interactions_with_device_tests.py b/py/test/selenium/webdriver/common/interactions_with_device_tests.py
@@ -247,6 +247,7 @@ def test_can_pause_with_pointer(driver, pages):
 
 @pytest.mark.xfail_firefox
 @pytest.mark.xfail_remote
+@pytest.mark.xfail_safari
 def test_can_scroll_to_element_with_wheel(driver, pages):
     pages.load("scrolling_tests/frame_with_nested_scrolling_frame_out_of_view.html")
     iframe = driver.find_element(By.TAG_NAME, "iframe")
@@ -262,6 +263,7 @@ def test_can_scroll_to_element_with_wheel(driver, pages):
 
 @pytest.mark.xfail_firefox
 @pytest.mark.xfail_remote
+@pytest.mark.xfail_safari
 def test_can_scroll_from_element_by_amount_with_wheel(driver, pages):
     pages.load("scrolling_tests/frame_with_nested_scrolling_frame_out_of_view.html")
     iframe = driver.find_element(By.TAG_NAME, "iframe")
@@ -278,6 +280,7 @@ def test_can_scroll_from_element_by_amount_with_wheel(driver, pages):
 
 @pytest.mark.xfail_firefox
 @pytest.mark.xfail_remote
+@pytest.mark.xfail_safari
 def test_can_scroll_from_element_with_offset_by_amount_with_wheel(driver, pages):
     pages.load("scrolling_tests/frame_with_nested_scrolling_frame_out_of_view.html")
     footer = driver.find_element(By.TAG_NAME, "footer")
@@ -320,6 +323,7 @@ def test_can_scroll_from_viewport_by_amount_with_wheel(driver, pages):
 
 
 @pytest.mark.xfail_firefox
+@pytest.mark.xfail_safari
 def test_can_scroll_from_viewport_with_offset_by_amount_with_wheel(driver, pages):
     pages.load("scrolling_tests/frame_with_nested_scrolling_frame.html")
     scroll_origin = ScrollOrigin.from_viewport(10, 10)
diff --git a/py/test/selenium/webdriver/common/position_and_size_tests.py b/py/test/selenium/webdriver/common/position_and_size_tests.py
@@ -53,6 +53,7 @@ def test_should_get_coordinates_of_an_invisible_element(driver, pages):
     _check_location(element.location, x=0, y=0)
 
 
+@pytest.mark.xfail_safari
 def test_should_scroll_page_and_get_coordinates_of_an_element_that_is_out_of_view_port(driver, pages):
     pages.load("coordinates_tests/page_with_element_out_of_view.html")
     element = driver.find_element(By.ID, "box")
@@ -89,6 +90,7 @@ def test_should_get_coordinates_of_an_element_in_anested_frame(driver, pages):
     _check_location(element.location, x=10, y=10)
 
 
+@pytest.mark.xfail_safari
 def test_should_get_coordinates_of_an_element_with_fixed_position(driver, pages):
     pages.load("coordinates_tests/page_with_fixed_element.html")
     element = driver.find_element(By.ID, "fixed")
diff --git a/py/test/selenium/webdriver/common/selenium_manager_tests.py b/py/test/selenium/webdriver/common/selenium_manager_tests.py
@@ -15,6 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import json
+import platform
 import sys
 from pathlib import Path
 from unittest import mock
@@ -59,10 +60,14 @@ def test_uses_windows(monkeypatch):
 
 def test_uses_linux(monkeypatch):
     monkeypatch.setattr(sys, "platform", "linux")
-    binary = SeleniumManager()._get_binary()
 
-    project_root = Path(selenium.__file__).parent.parent
-    assert binary == project_root.joinpath("selenium/webdriver/common/linux/selenium-manager")
+    if platform.machine() == "arm64":
+        with pytest.raises(WebDriverException, match="Unsupported platform/architecture combination: linux/arm64"):
+            SeleniumManager()._get_binary()
+    else:
+        binary = SeleniumManager()._get_binary()
+        project_root = Path(selenium.__file__).parent.parent
+        assert binary == project_root.joinpath("selenium/webdriver/common/linux/selenium-manager")
 
 
 def test_uses_mac(monkeypatch):
diff --git a/py/test/selenium/webdriver/common/upload_tests.py b/py/test/selenium/webdriver/common/upload_tests.py
@@ -16,6 +16,7 @@
 # under the License.
 
 import os
+import textwrap
 
 import pytest
 
@@ -30,11 +31,13 @@ def get_local_path():
     current_dir = os.path.dirname(os.path.realpath(__file__))
 
     def wrapped(filename):
-        return os.path.join(current_dir, filename)
+        full_path = os.path.join(current_dir, filename)
+        return textwrap.fill(full_path, width=512)
 
     return wrapped
 
 
+@pytest.mark.xfail_safari
 def test_can_upload_file(driver, pages, get_local_path):
     pages.load("upload.html")
 
@@ -45,6 +48,7 @@ def test_can_upload_file(driver, pages, get_local_path):
     WebDriverWait(driver, 10).until(EC.text_to_be_present_in_element((By.CSS_SELECTOR, "body"), "test_file.txt"))
 
 
+@pytest.mark.xfail_safari
 def test_can_upload_two_files(driver, pages, get_local_path):
     pages.load("upload.html")
     two_file_paths = get_local_path("test_file.txt") + "\n" + get_local_path("test_file2.txt")
diff --git a/py/test/selenium/webdriver/common/w3c_interaction_tests.py b/py/test/selenium/webdriver/common/w3c_interaction_tests.py
@@ -176,6 +176,7 @@ def test_dragging_element_with_mouse_fires_events(driver, pages):
 
 @pytest.mark.xfail_firefox
 @pytest.mark.xfail_remote
+@pytest.mark.xfail_safari
 def test_pen_pointer_properties(driver, pages):
     pages.load("pointerActionsPage.html")
 
@@ -223,6 +224,7 @@ def test_pen_pointer_properties(driver, pages):
 
 @pytest.mark.xfail_firefox
 @pytest.mark.xfail_remote
+@pytest.mark.xfail_safari
 def test_touch_pointer_properties(driver, pages):
     pages.load("pointerActionsPage.html")
     pointerArea = driver.find_element(By.CSS_SELECTOR, "#pointerArea")
diff --git a/py/test/selenium/webdriver/common/webdriverwait_tests.py b/py/test/selenium/webdriver/common/webdriverwait_tests.py
@@ -35,6 +35,7 @@ def throw_sere(driver):
 
 @pytest.mark.xfail_chrome(reason="https://bugs.chromium.org/p/chromedriver/issues/detail?id=4743")
 @pytest.mark.xfail_edge(reason="https://bugs.chromium.org/p/chromedriver/issues/detail?id=4743")
+@pytest.mark.xfail_safari
 def test_should_fail_with_invalid_selector_exception(driver, pages):
     pages.load("dynamic.html")
     with pytest.raises(InvalidSelectorException):
diff --git a/py/test/selenium/webdriver/common/webserver.py b/py/test/selenium/webdriver/common/webserver.py
diff --git a/py/test/selenium/webdriver/common/window_switching_tests.py b/py/test/selenium/webdriver/common/window_switching_tests.py
diff --git a/py/test/selenium/webdriver/safari/__init__.py b/py/test/selenium/webdriver/safari/__init__.py
diff --git a/py/test/selenium/webdriver/safari/safari_service_tests.py b/py/test/selenium/webdriver/safari/safari_service_tests.py

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ protected void channelRead0(ChannelHandlerContext ctx, HttpObject msg) throws Ex`
`96`	`96`	`length = -1;`
`97`	`97`	`}`
`98`	`98`
`99`		`- if (msg instanceof HttpContent) {`
	`99`	`+ if (request != null && msg instanceof HttpContent) {`
`100`	`100`	`ByteBuf buf = ((HttpContent) msg).content().retain();`
`101`	`101`	`int nBytes = buf.readableBytes();`
`102`	`102`