test(mockwebserver): fix concurrency issues

Signed-off-by: Marc Nuri <[email protected]>
fabric8io · Jan 2, 2024 · 2bd234b · 2bd234b
1 parent de8e718
commit 2bd234b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/junit/mockwebserver/src/test/groovy/io/fabric8/mockwebserver/DefaultMockServerTest.groovy b/junit/mockwebserver/src/test/groovy/io/fabric8/mockwebserver/DefaultMockServerTest.groovy
@@ -620,7 +620,7 @@ class DefaultMockServerTest extends Specification {
       server.expect().get().withPath("/api/v1/users/watch")
         .andUpgradeToWebSocket()
         .open()
-        .immediately().andEmit("READY")
+        .waitFor(50L).andEmit("READY")
         .expectHttpRequest("/api/v1/create").andEmit("CREATED").once()
         .expectSentWebSocketMessage("CREATED").andEmit("WS-CREATED").once()
         .done()

diff --git a/...kwebserver/src/test/groovy/io/fabric8/mockwebserver/DefaultMockServerWebSocketTest.groovy b/...kwebserver/src/test/groovy/io/fabric8/mockwebserver/DefaultMockServerWebSocketTest.groovy
@@ -123,9 +123,13 @@ class DefaultMockServerWebSocketTest extends Specification {
       def wsReq = wsClient.webSocket().connect(server.port, server.getHostName(), "/websocket")
     and: "A WebSocket listener"
       wsReq.onComplete { ws ->
-        ws.result().closeHandler { _ ->
-          ws.result().close()
+        if (ws.result().isClosed()) {
           future.complete(ws.result().closeReason())
+        } else {
+          ws.result().closeHandler { _ ->
+            ws.result().close()
+            future.complete(ws.result().closeReason())
+          }
         }
       }
     and: "An instance of AsyncConditions"