Configure initial settings for Http2ClientTimeout tests instead of co…

…nfiguring the connection initially as it can be racy
eclipse-vertx · Nov 15, 2023 · a33a8f6 · a33a8f6
1 parent 2349b9a
commit a33a8f6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/src/test/java/io/vertx/core/http/Http2ClientTimeoutTest.java b/src/test/java/io/vertx/core/http/Http2ClientTimeoutTest.java
@@ -14,7 +14,9 @@ public class Http2ClientTimeoutTest extends HttpClientTimeoutTest {
 
   @Override
   protected HttpServerOptions createBaseServerOptions() {
-    return Http2ServerTest.createHttp2ServerOptions(HttpTestBase.DEFAULT_HTTPS_PORT, HttpTestBase.DEFAULT_HTTPS_HOST);
+    return Http2ServerTest
+      .createHttp2ServerOptions(HttpTestBase.DEFAULT_HTTPS_PORT, HttpTestBase.DEFAULT_HTTPS_HOST)
+      .setInitialSettings(new Http2Settings().setMaxConcurrentStreams(5));
   }
 
   @Override

diff --git a/src/test/java/io/vertx/core/http/HttpClientTimeoutTest.java b/src/test/java/io/vertx/core/http/HttpClientTimeoutTest.java
@@ -37,11 +37,6 @@ public void testConnectTimeoutDoesFire() throws Exception {
     server.requestHandler(req -> {
       req.response().end();
     });
-    server.connectionHandler(conn -> {
-      if (conn.getWindowSize() != -1) {
-        conn.updateSettings(new Http2Settings().setMaxConcurrentStreams(5));
-      }
-    });
     startServer(testAddress);
     List<HttpClientRequest> requests = new ArrayList<>();
     for (int i = 0;i < 5;i++) {
@@ -64,11 +59,6 @@ public void testConnectTimeoutDoesNotFire() throws Exception {
     server.requestHandler(req -> {
       req.response().end();
     });
-    server.connectionHandler(conn -> {
-      if (conn.getWindowSize() != -1) {
-        conn.updateSettings(new Http2Settings().setMaxConcurrentStreams(5));
-      }
-    });
     startServer(testAddress);
     List<HttpClientRequest> requests = new ArrayList<>();
     for (int i = 0;i < 5;i++) {