Skip to content

Commit e6ee958

Browse files
Try to fix flaky test by letting VertX choose a random port (#2361)
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
1 parent fe24b26 commit e6ee958

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

apm-agent-plugins/apm-vertx/apm-vertx-common/src/test/java/co/elastic/apm/agent/vertx/helper/VertxTestHttpServer.java

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*/
1919
package co.elastic.apm.agent.vertx.helper;
2020

21-
import co.elastic.apm.agent.testutils.TestPort;
2221
import io.vertx.core.Vertx;
2322
import io.vertx.core.VertxOptions;
2423
import io.vertx.core.http.HttpServer;
@@ -44,14 +43,12 @@ public class VertxTestHttpServer {
4443
@Nullable
4544
private HttpServer server;
4645

47-
private final int port;
4846
private final Router router;
4947

5048

5149
VertxTestHttpServer() {
5250
vertx = Vertx.vertx(new VertxOptions().setEventLoopPoolSize(5));
5351
router = Router.router(vertx);
54-
port = TestPort.getAvailableRandomPort();
5552
}
5653

5754

@@ -65,14 +62,14 @@ public void setup(VertxTestContext testContext, boolean useSSL) throws Throwable
6562
}
6663

6764
server = vertx.createHttpServer(serverOptions);
68-
server.requestHandler(router).listen(port, testContext.succeedingThenComplete());
65+
server.requestHandler(router).listen(0, testContext.succeedingThenComplete());
6966
assertThat(testContext.awaitCompletion(2, TimeUnit.SECONDS)).isTrue();
7067
if (testContext.failed()) {
71-
logger.error("starting vertx server on port {} failed", port);
68+
logger.error("starting vertx server on port {} failed", server.actualPort());
7269
throw testContext.causeOfFailure();
7370
}
7471

75-
logger.info("starting vertx server on port {} succeeded", port);
72+
logger.info("starting vertx server on port {} succeeded", server.actualPort());
7673

7774
}
7875

@@ -82,14 +79,14 @@ public void tearDown(VertxTestContext testContext) throws Throwable {
8279

8380
assertThat(testContext.awaitCompletion(2, TimeUnit.SECONDS)).isTrue();
8481
if (testContext.failed()) {
85-
logger.error("stopping vertx server on port {} failed", port);
82+
logger.error("stopping vertx server on port {} failed", server.actualPort());
8683
throw testContext.causeOfFailure();
8784
}
88-
logger.info("stopping vertx server on port {} succeeded", port);
85+
logger.info("stopping vertx server on port {} succeeded", server.actualPort());
8986
}
9087

9188
public int getPort() {
92-
return port;
89+
return server.actualPort();
9390
}
9491

9592
public Router getRouter() {

0 commit comments

Comments
 (0)