properly stop Selenide proxy server

* method proxy.stop() waits for network traffic to stop (up to 5 seconds), while * method proxy.abort() doesn't wait for anything, causing proxy-related errors in logs
selenide · Aug 13, 2022 · b89ff38 · b89ff38
1 parent 7ec42a7
commit b89ff38
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/src/main/java/com/codeborne/selenide/proxy/SelenideProxyServer.java b/src/main/java/com/codeborne/selenide/proxy/SelenideProxyServer.java
@@ -157,7 +157,7 @@ private Proxy createSeleniumProxy() {
   public void shutdown() {
     if (proxy.isStarted()) {
       try {
-        proxy.abort();
+        proxy.stop();
       }
       catch (IllegalStateException ignore) {
       }

diff --git a/src/test/java/com/codeborne/selenide/proxy/SelenideProxyServerTest.java b/src/test/java/com/codeborne/selenide/proxy/SelenideProxyServerTest.java
@@ -74,7 +74,7 @@ void canChainProxyServersWithEmptyNoProxySettings() {
   void canShutdownProxyServer() {
     when(bmp.isStarted()).thenReturn(true);
     proxyServer.shutdown();
-    verify(bmp).abort();
+    verify(bmp).stop();
   }
 
   @Test

diff --git a/src/test/java/integration/server/LocalHttpServer.java b/src/test/java/integration/server/LocalHttpServer.java
@@ -68,6 +68,10 @@ public LocalHttpServer start() throws Exception {
     return this;
   }
 
+  public void stop() throws Exception {
+    server.stop();
+  }
+
   public static LocalHttpServer startWithRetry(boolean ssl) throws Exception {
     IOException lastError = null;
     for (int i = 0; i < 5; i++) {