Skip to content

Try to fix flaky VertxServerTest #2361

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 24, 2021
Merged

Try to fix flaky VertxServerTest #2361

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
57dd467
Try to fix flaky test by letting VertX choose a random port
tobiasstadler Dec 21, 2021
4356bfc
Merge branch 'master' into try-fix-flaky-VertxServerTest
mergify[bot] Dec 22, 2021
5ac6b21
Merge branch 'master' into try-fix-flaky-VertxServerTest
mergify[bot] Dec 22, 2021
618a74c
Merge branch 'elastic:master' into try-fix-flaky-VertxServerTest
tobiasstadler Dec 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions ...apm-vertx-common/src/test/java/co/elastic/apm/agent/vertx/helper/VertxTestHttpServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*/
package co.elastic.apm.agent.vertx.helper;

import co.elastic.apm.agent.testutils.TestPort;
import io.vertx.core.Vertx;
import io.vertx.core.VertxOptions;
import io.vertx.core.http.HttpServer;
Expand All @@ -44,14 +43,12 @@ public class VertxTestHttpServer {
@Nullable
private HttpServer server;

private final int port;
private final Router router;


VertxTestHttpServer() {
vertx = Vertx.vertx(new VertxOptions().setEventLoopPoolSize(5));
router = Router.router(vertx);
port = TestPort.getAvailableRandomPort();
}


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

server = vertx.createHttpServer(serverOptions);
server.requestHandler(router).listen(port, testContext.succeedingThenComplete());
server.requestHandler(router).listen(0, testContext.succeedingThenComplete());
assertThat(testContext.awaitCompletion(2, TimeUnit.SECONDS)).isTrue();
if (testContext.failed()) {
logger.error("starting vertx server on port {} failed", port);
logger.error("starting vertx server on port {} failed", server.actualPort());
throw testContext.causeOfFailure();
}

logger.info("starting vertx server on port {} succeeded", port);
logger.info("starting vertx server on port {} succeeded", server.actualPort());

}

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

assertThat(testContext.awaitCompletion(2, TimeUnit.SECONDS)).isTrue();
if (testContext.failed()) {
logger.error("stopping vertx server on port {} failed", port);
logger.error("stopping vertx server on port {} failed", server.actualPort());
throw testContext.causeOfFailure();
}
logger.info("stopping vertx server on port {} succeeded", port);
logger.info("stopping vertx server on port {} succeeded", server.actualPort());
}

public int getPort() {
return port;
return server.actualPort();
}

public Router getRouter() {
Expand Down