From 428f5cea3df6e4af640f07d26e4bffcfb176a561 Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Fri, 10 May 2024 09:50:40 +0000 Subject: [PATCH] fix: add awaitTermination for test cleanup. --- .../google/showcase/v1beta1/it/ITApiVersionHeaders.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/ITApiVersionHeaders.java b/showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/ITApiVersionHeaders.java index 34ca48e985..7ef4019975 100644 --- a/showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/ITApiVersionHeaders.java +++ b/showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/ITApiVersionHeaders.java @@ -30,6 +30,7 @@ import io.grpc.*; import java.io.IOException; import java.util.ArrayList; +import java.util.concurrent.TimeUnit; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -50,6 +51,7 @@ public class ITApiVersionHeaders { private static final String EXPECTED_EXCEPTION_MESSAGE = "Header provider can't override the header: " + ApiClientHeaderProvider.API_VERSION_HEADER_KEY; + private static final int DEFAULT_AWAIT_TERMINATION_SEC = 10; // Implement a client interceptor to retrieve the trailing metadata from response. private static class GrpcCapturingClientInterceptor implements ClientInterceptor { @@ -182,11 +184,16 @@ public void createClients() throws Exception { } @After - public void destroyClient() { + public void destroyClient() throws InterruptedException { grpcClient.close(); httpJsonClient.close(); grpcComplianceClient.close(); httpJsonComplianceClient.close(); + + grpcClient.awaitTermination(DEFAULT_AWAIT_TERMINATION_SEC, TimeUnit.SECONDS); + httpJsonClient.awaitTermination(DEFAULT_AWAIT_TERMINATION_SEC, TimeUnit.SECONDS); + grpcComplianceClient.awaitTermination(DEFAULT_AWAIT_TERMINATION_SEC, TimeUnit.SECONDS); + httpJsonComplianceClient.awaitTermination(DEFAULT_AWAIT_TERMINATION_SEC, TimeUnit.SECONDS); } @Test