Skip to content

Fix flakiness in S2A tests. #12536

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 1 commit into from
Nov 25, 2025
Merged

Fix flakiness in S2A tests. #12536

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
10 changes: 8 additions & 2 deletions s2a/src/test/java/io/grpc/s2a/internal/handshaker/FakeS2AServerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeoutException;
import java.util.logging.Logger;
import org.junit.After;
import org.junit.Before;
Expand Down Expand Up @@ -77,7 +78,10 @@ public void tearDown() throws Exception {

@Test
public void callS2AServerOnce_getTlsConfiguration_returnsValidResult()
throws InterruptedException, IOException, java.util.concurrent.ExecutionException {
throws InterruptedException,
IOException,
java.util.concurrent.ExecutionException,
TimeoutException {
ExecutorService executor = Executors.newSingleThreadExecutor();
logger.info("Client connecting to: " + serverAddress);
ManagedChannel channel =
Expand Down Expand Up @@ -121,6 +125,7 @@ public void onCompleted() {
// Mark the end of requests.
requestObserver.onCompleted();
// Wait for receiving to happen.
respFuture.get(5, SECONDS);
} finally {
channel.shutdown();
channel.awaitTermination(1, SECONDS);
Expand Down Expand Up @@ -165,7 +170,7 @@ public void onCompleted() {

@Test
public void callS2AServerOnce_validatePeerCertifiate_returnsValidResult()
throws InterruptedException, java.util.concurrent.ExecutionException {
throws InterruptedException, java.util.concurrent.ExecutionException, TimeoutException {
ExecutorService executor = Executors.newSingleThreadExecutor();
logger.info("Client connecting to: " + serverAddress);
ManagedChannel channel =
Expand Down Expand Up @@ -212,6 +217,7 @@ public void onCompleted() {
// Mark the end of requests.
requestObserver.onCompleted();
// Wait for receiving to happen.
respFuture.get(5, SECONDS);
} finally {
channel.shutdown();
channel.awaitTermination(1, SECONDS);
Expand Down