Merge branch 'trunk' into webelement-nullable-2

Author: RenderMichael

java/src/org/openqa/selenium/grid/data/NodeStatus.java

@@ -76,7 +76,7 @@ public static NodeStatus fromJson(JsonInput input) {
     Set<Slot> slots = null;
     Availability availability = null;
     Duration heartbeatPeriod = null;
-    Duration sessionTimeout = null;
+    Duration sessionTimeout = Duration.ofSeconds(300);
     String version = null;
     Map<String, String> osInfo = null;
 

java/src/org/openqa/selenium/remote/http/jdk/JdkHttpClient.java

@@ -511,15 +511,28 @@ public void close() {
     if (this.client == null) {
       return;
     }
-    this.client = null;
+
     for (WebSocket websocket : websockets) {
       try {
         websocket.close();
       } catch (Exception e) {
         LOG.log(Level.WARNING, "failed to close the websocket: " + websocket, e);
       }
     }
-    executorService.shutdownNow();
+
+    if (this.client instanceof AutoCloseable) {
+      AutoCloseable closeable = (AutoCloseable) this.client;
+      executorService.submit(
+          () -> {
+            try {
+              closeable.close();
+            } catch (Exception e) {
+              LOG.log(Level.WARNING, "failed to close the http client: " + closeable, e);
+            }
+          });
+    }
+    this.client = null;
+    executorService.shutdown();
   }
 
   @AutoService(HttpClient.Factory.class)

java/test/org/openqa/selenium/grid/data/NodeStatusTest.java

@@ -72,4 +72,79 @@ void ensureRoundTripWorks() throws URISyntaxException {
 
     assertThat(seen).isEqualTo(status);
   }
+
+  @Test
+  void withoutSessionTimeoutInJsonStatus() throws URISyntaxException {
+    String source =
+        "{\n"
+            + "      \"availability\": \"UP\",\n"
+            + "      \"externalUri\": \"http:\\u002f\\u002f192.168.1.101:5555\",\n"
+            + "      \"heartbeatPeriod\": 60000,\n"
+            + "      \"maxSessions\": 1,\n"
+            + "      \"nodeId\": \"d136dd9b-6497-4049-9371-42f89b14ea2b\",\n"
+            + "      \"osInfo\": {\n"
+            + "        \"arch\": \"aarch64\",\n"
+            + "        \"name\": \"Mac OS X\",\n"
+            + "        \"version\": \"15.3\"\n"
+            + "      },\n"
+            + "      \"slots\": [\n"
+            + "        {\n"
+            + "          \"id\": {\n"
+            + "            \"hostId\": \"d136dd9b-6497-4049-9371-42f89b14ea2b\",\n"
+            + "            \"id\": \"965e8cb4-7b48-4638-8bc8-6889c6319682\"\n"
+            + "          },\n"
+            + "          \"lastStarted\": \"1970-01-01T00:00:00Z\",\n"
+            + "          \"session\": null,\n"
+            + "          \"stereotype\": {\n"
+            + "            \"browserName\": \"chrome\",\n"
+            + "            \"platformName\": \"mac\"\n"
+            + "          }\n"
+            + "        }\n"
+            + "      ],\n"
+            + "      \"version\": \"4.17.0 (revision unknown*)\"\n"
+            + "    }";
+
+    Json json = new Json();
+    NodeStatus nodeStatus = json.toType(source, NodeStatus.class);
+
+    assertThat(nodeStatus.getSessionTimeout()).isEqualTo(Duration.ofSeconds(300));
+  }
+
+  @Test
+  void withSessionTimeoutInJsonStatus() throws URISyntaxException {
+    String source =
+        "{\n"
+            + "      \"availability\": \"UP\",\n"
+            + "      \"externalUri\": \"http:\\u002f\\u002f192.168.1.101:5555\",\n"
+            + "      \"heartbeatPeriod\": 60000,\n"
+            + "      \"maxSessions\": 1,\n"
+            + "      \"sessionTimeout\": 600000,\n"
+            + "      \"nodeId\": \"d136dd9b-6497-4049-9371-42f89b14ea2b\",\n"
+            + "      \"osInfo\": {\n"
+            + "        \"arch\": \"aarch64\",\n"
+            + "        \"name\": \"Mac OS X\",\n"
+            + "        \"version\": \"15.3\"\n"
+            + "      },\n"
+            + "      \"slots\": [\n"
+            + "        {\n"
+            + "          \"id\": {\n"
+            + "            \"hostId\": \"d136dd9b-6497-4049-9371-42f89b14ea2b\",\n"
+            + "            \"id\": \"965e8cb4-7b48-4638-8bc8-6889c6319682\"\n"
+            + "          },\n"
+            + "          \"lastStarted\": \"1970-01-01T00:00:00Z\",\n"
+            + "          \"session\": null,\n"
+            + "          \"stereotype\": {\n"
+            + "            \"browserName\": \"chrome\",\n"
+            + "            \"platformName\": \"mac\"\n"
+            + "          }\n"
+            + "        }\n"
+            + "      ],\n"
+            + "      \"version\": \"4.17.0 (revision unknown*)\"\n"
+            + "    }";
+
+    Json json = new Json();
+    NodeStatus nodeStatus = json.toType(source, NodeStatus.class);
+
+    assertThat(nodeStatus.getSessionTimeout()).isEqualTo(Duration.ofSeconds(600));
+  }
 }

py/selenium/webdriver/remote/webdriver.py

@@ -715,24 +715,34 @@ def get_cookies(self) -> List[dict]:
         return self.execute(Command.GET_ALL_COOKIES)["value"]
 
     def get_cookie(self, name) -> Optional[Dict]:
-        """Get a single cookie by name. Returns the cookie if found, None if
-        not.
+        """Get a single cookie by name. Raises ValueError if the name is empty
+        or whitespace. Returns the cookie if found, None if not.
 
         Example:
         --------
         >>> cookie = driver.get_cookie('my_cookie')
         """
+        if not name or name.isspace():
+            raise ValueError("Cookie name cannot be empty")
+
         with contextlib.suppress(NoSuchCookieException):
             return self.execute(Command.GET_COOKIE, {"name": name})["value"]
+
         return None
 
     def delete_cookie(self, name) -> None:
-        """Deletes a single cookie with the given name.
+        """Deletes a single cookie with the given name. Raises ValueError if
+        the name is empty or whitespace.
 
         Example:
         --------
         >>> driver.delete_cookie('my_cookie')
         """
+
+        # firefox deletes all cookies when "" is passed as name
+        if not name or name.isspace():
+            raise ValueError("Cookie name cannot be empty")
+
         self.execute(Command.DELETE_COOKIE, {"name": name})
 
     def delete_all_cookies(self) -> None:

py/test/selenium/webdriver/common/cookie_tests.py

@@ -152,3 +152,31 @@ def test_should_not_delete_cookies_with_asimilar_name(cookie, driver, webserver)
     cookies = driver.get_cookies()
     assert cookie["name"] != cookies[0]["name"]
     assert cookie2["name"] == cookies[0]["name"]
+
+
+def test_get_cookie_raises_value_error_for_empty_name(cookie, driver):
+    driver.add_cookie(cookie)
+    with pytest.raises(ValueError, match="Cookie name cannot be empty"):
+        driver.get_cookie("")
+    with pytest.raises(ValueError, match="Cookie name cannot be empty"):
+        driver.get_cookie("   ")
+    with pytest.raises(ValueError, match="Cookie name cannot be empty"):
+        driver.get_cookie(None)
+
+
+def test_delete_cookie_raises_value_error_for_empty_name(cookie, driver):
+    cookie2 = cookie.copy()
+    cookie2["name"] = "{}x".format(cookie["name"])
+    driver.add_cookie(cookie)
+    driver.add_cookie(cookie2)
+
+    with pytest.raises(ValueError, match="Cookie name cannot be empty"):
+        driver.delete_cookie("")
+    with pytest.raises(ValueError, match="Cookie name cannot be empty"):
+        driver.get_cookie("   ")
+    with pytest.raises(ValueError, match="Cookie name cannot be empty"):
+        driver.get_cookie(None)
+
+    cookies = driver.get_cookies()
+
+    assert len(cookies) == 2