Use port 0 when starting a websocket server in tests (PegaSysEng#1416)

notlesh · May 14, 2019 · 25242c5 · 25242c5
1 parent 8c414f8
commit 25242c5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/...c/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcHttpServiceRpcApisTest.java b/...c/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcHttpServiceRpcApisTest.java
@@ -266,6 +266,8 @@ private JsonRpcHttpService createJsonRpcHttpService(
     final Set<Capability> supportedCapabilities = new HashSet<>();
     supportedCapabilities.add(EthProtocol.ETH62);
     supportedCapabilities.add(EthProtocol.ETH63);
+    jsonRpcConfiguration.setPort(0);
+    webSocketConfiguration.setPort(0);
 
     final Map<String, JsonRpcMethod> rpcMethods =
         spy(

diff --git a/...est/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/WebSocketHostWhitelistTest.java b/...est/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/WebSocketHostWhitelistTest.java
@@ -20,6 +20,7 @@
 import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.methods.WebSocketMethodsFactory;
 import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.SubscriptionManager;
 
+import java.net.InetSocketAddress;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
@@ -56,9 +57,11 @@ public class WebSocketHostWhitelistTest {
   private WebSocketService websocketService;
   private HttpClient httpClient;
   private static final int VERTX_AWAIT_TIMEOUT_MILLIS = 10000;
+  private int websocketPort;
 
   @Before
   public void initServerAndClient() {
+    webSocketConfiguration.setPort(0);
     vertx = Vertx.vertx();
 
     final Map<String, JsonRpcMethod> websocketMethods =
@@ -68,11 +71,13 @@ public void initServerAndClient() {
     websocketService =
         new WebSocketService(vertx, webSocketConfiguration, webSocketRequestHandlerSpy);
     websocketService.start().join();
+    final InetSocketAddress inetSocketAddress = websocketService.socketAddress();
 
+    websocketPort = inetSocketAddress.getPort();
     final HttpClientOptions httpClientOptions =
         new HttpClientOptions()
             .setDefaultHost(webSocketConfiguration.getHost())
-            .setDefaultPort(webSocketConfiguration.getPort());
+            .setDefaultPort(websocketPort);
 
     httpClient = vertx.createHttpClient(httpClientOptions);
   }
@@ -171,7 +176,7 @@ private void doHttpRequestAndVerify(
 
     final HttpClientRequest request =
         httpClient.post(
-            webSocketConfiguration.getPort(),
+            websocketPort,
             webSocketConfiguration.getHost(),
             "/",
             response -> {