Skip to content
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

test: increase timeouts for ViteWebsocketConnection tests #21093

Merged
merged 1 commit into from
Mar 6, 2025
Merged

test: increase timeouts for ViteWebsocketConnection tests #21093

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 9 additions & 11 deletions ...server/src/test/java/com/vaadin/base/devserver/viteproxy/ViteWebsocketConnectionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public void tearDown() throws Exception {
}
}

@Test(timeout = 5000)
@Test(timeout = 7000)
public void waitForConnection_clientWebsocketAvailable_blocksUntilConnectionIsEstablished()
throws ExecutionException, InterruptedException {
CountDownLatch connectionLatch = new CountDownLatch(1);
Expand All @@ -79,19 +79,17 @@ public void waitForConnection_clientWebsocketAvailable_blocksUntilConnectionIsEs
long startTime = System.nanoTime();
ViteWebsocketConnection viteConnection = new ViteWebsocketConnection(
httpServer.getAddress().getPort(), "/VAADIN", "proto", x -> {
}, () -> {
closeLatch.countDown();
}, err -> {
}, closeLatch::countDown, err -> {
error.set(err);
connectionLatch.countDown();
}) {
@Override
public void onOpen(WebSocket webSocket) {
connectionLatch.countDown();
super.onOpen(webSocket);
connectionLatch.countDown();
}
};
boolean established = connectionLatch.await(2, TimeUnit.SECONDS);
boolean established = connectionLatch.await(5, TimeUnit.SECONDS);
long elapsedTime = Duration.ofNanos(System.nanoTime() - startTime)
.toMillis();
if (error.get() != null) {
Expand All @@ -108,7 +106,7 @@ public void onOpen(WebSocket webSocket) {
Assert.assertTrue(
"Should not have been blocked too long after connection (elapsed time: "
+ elapsedTime + ")",
elapsedTime < 1000);
elapsedTime < 2500);
if (!closeLatch.await(500, TimeUnit.MILLISECONDS)) {
viteConnection.close();
closeLatch.await(500, TimeUnit.MILLISECONDS);
Expand All @@ -125,13 +123,13 @@ public void waitForConnection_clientWebsocketNotAvailable_fails()
"/VAADIN", "proto", x -> {
}, () -> {
}, err -> errorLatch.countDown());
if (!errorLatch.await(2, TimeUnit.SECONDS)) {
if (!errorLatch.await(5, TimeUnit.SECONDS)) {
Assert.fail(
"Expecting connection failure, but not happened in 2 seconds");
"Expecting connection failure, but not happened in 5 seconds");
}
}

@Test(timeout = 2000)
@Test(timeout = 5000)
public void close_clientWebsocketNotAvailable_dontBlock()
throws ExecutionException, InterruptedException {
AtomicReference<Throwable> connectionError = new AtomicReference<>();
Expand All @@ -149,7 +147,7 @@ public void close_clientWebsocketNotAvailable_dontBlock()
}

@SuppressWarnings("unchecked")
@Test(timeout = 2000)
@Test(timeout = 3500)
public void close_clientWebsocketClose_dontBlockIndefinitely()
throws ExecutionException, InterruptedException,
NoSuchFieldException, InvocationTargetException,
Expand Down
Loading