Merge remote-tracking branch 'origin/trunk' into kloczek/trunk

Signed-off-by: Viet Nguyen Duc <[email protected]>

Author: VietND96

java/src/org/openqa/selenium/concurrent/BUILD.bazel

@@ -4,6 +4,7 @@ java_library(
     name = "concurrent",
     srcs = glob(["*.java"]),
     visibility = [
+        "//java/src/org/openqa/selenium/events:__subpackages__",
         "//java/src/org/openqa/selenium/grid:__subpackages__",
         "//java/src/org/openqa/selenium/remote:__subpackages__",
     ],

java/src/org/openqa/selenium/events/zeromq/BUILD.bazel

@@ -12,6 +12,7 @@ java_library(
     ],
     deps = [
         "//java/src/org/openqa/selenium:core",
+        "//java/src/org/openqa/selenium/concurrent",
         "//java/src/org/openqa/selenium/events",
         "//java/src/org/openqa/selenium/grid/config",
         "//java/src/org/openqa/selenium/grid/security",

java/src/org/openqa/selenium/events/zeromq/UnboundZmqEventBus.java

@@ -42,6 +42,7 @@
 import java.util.function.Consumer;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import org.openqa.selenium.concurrent.ExecutorServices;
 import org.openqa.selenium.events.Event;
 import org.openqa.selenium.events.EventBus;
 import org.openqa.selenium.events.EventListener;
@@ -61,6 +62,7 @@ class UnboundZmqEventBus implements EventBus {
   private static final Logger LOG = Logger.getLogger(EventBus.class.getName());
   private static final Json JSON = new Json();
   private final AtomicBoolean pollingStarted = new AtomicBoolean(false);
+  private final PollingRunnable socketPolling;
   private final ExecutorService socketPollingExecutor;
   private final ExecutorService socketPublishingExecutor;
   private final ExecutorService listenerNotificationExecutor;
@@ -147,7 +149,8 @@ class UnboundZmqEventBus implements EventBus {
 
     LOG.info("Sockets created");
 
-    socketPollingExecutor.submit(new PollingRunnable(secret));
+    socketPolling = new PollingRunnable(secret);
+    socketPollingExecutor.submit(socketPolling);
 
     // Give ourselves up to a second to connect, using The World's Worst heuristic. If we don't
     // manage to connect, it's not the end of the world, as the socket we're connecting to may not
@@ -211,9 +214,11 @@ public void fire(Event event) {
 
   @Override
   public void close() {
-    socketPollingExecutor.shutdownNow();
-    socketPublishingExecutor.shutdownNow();
-    listenerNotificationExecutor.shutdownNow();
+    socketPolling.shutdown = true;
+    ExecutorServices.shutdownGracefully("Event Bus Poller", socketPollingExecutor);
+    ExecutorServices.shutdownGracefully("Event Bus Publisher", socketPublishingExecutor);
+    ExecutorServices.shutdownGracefully(
+        "Event Bus Listener Notifier", listenerNotificationExecutor);
     poller.close();
 
     if (sub != null) {
@@ -226,14 +231,15 @@ public void close() {
 
   private class PollingRunnable implements Runnable {
     private final Secret secret;
+    private volatile boolean shutdown;
 
     public PollingRunnable(Secret secret) {
       this.secret = secret;
     }
 
     @Override
     public void run() {
-      while (!Thread.currentThread().isInterrupted()) {
+      while (!Thread.currentThread().isInterrupted() && !shutdown) {
         try {
           int count = poller.poll(150);
 

py/selenium/webdriver/remote/webelement.py

@@ -25,7 +25,6 @@
 from base64 import encodebytes
 from hashlib import md5 as md5_hash
 from io import BytesIO
-from typing import List
 
 from selenium.common.exceptions import JavascriptException
 from selenium.common.exceptions import WebDriverException

rb/spec/integration/selenium/webdriver/bidi/network_spec.rb

@@ -12,12 +12,12 @@
 #
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
-# "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
 
+
 require_relative '../spec_helper'
 
 module Selenium

rb/spec/integration/selenium/webdriver/network_spec.rb

@@ -12,12 +12,12 @@
 #
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
-# "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
 
+
 require_relative 'spec_helper'
 
 module Selenium