#10345 make driver.close() tolerant to CDP failures (#10346)

asolntsev · web-flow · commit 635363b1d7fc · 2022-02-11T11:07:23.000+01:00
Driver should still be closed even if failed to disconnect DevTools session (which apparently happens because Selenium doesn't support current version of browser's CDP)

Co-authored-by: Diego Molina &lt;diemol@users.noreply.github.com&gt;

[skip ci]
diff --git a/java/src/org/openqa/selenium/remote/RemoteWebDriver.java b/java/src/org/openqa/selenium/remote/RemoteWebDriver.java
@@ -67,6 +67,7 @@
 import org.openqa.selenium.logging.NeedsLocalLogs;
 import org.openqa.selenium.print.PrintOptions;
 import org.openqa.selenium.remote.http.ClientConfig;
+import org.openqa.selenium.remote.http.ConnectionFailedException;
 import org.openqa.selenium.remote.http.HttpClient;
 import org.openqa.selenium.remote.internal.WebElementToJsonConverter;
 import org.openqa.selenium.remote.tracing.TracedHttpClient;
@@ -96,6 +97,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static java.util.logging.Level.SEVERE;
+
 @Augmentable
 public class RemoteWebDriver implements WebDriver,
   JavascriptExecutor,
@@ -437,7 +440,13 @@ public void close() {
       // first browser window is closed, the next CDP command will hang
       // indefinitely. To prevent that from happening, we close the current
       // connection. The next CDP command _should_ make us reconnect
-      ((HasDevTools) this).maybeGetDevTools().ifPresent(DevTools::disconnectSession);
+
+      try {
+        ((HasDevTools) this).maybeGetDevTools().ifPresent(DevTools::disconnectSession);
+      }
+      catch (ConnectionFailedException unableToEstablishWebsocketConnection) {
+        logger.log(SEVERE, "Failed to disconnect DevTools session", unableToEstablishWebsocketConnection);
+      }
     }
 
     execute(DriverCommand.CLOSE);
