Fix slow tests that took 40 seconds to get through tearDown.

larry-safran · Sep 16, 2024 · 18a3de2 · 18a3de2
1 parent 3a6be9c
commit 18a3de2
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/s2a/src/test/java/io/grpc/s2a/handshaker/IntegrationTest.java b/s2a/src/test/java/io/grpc/s2a/handshaker/IntegrationTest.java
@@ -180,14 +180,15 @@ public void setUp() throws Exception {
 
   @After
   public void tearDown() throws Exception {
-    server.awaitTermination(10, SECONDS);
     server.shutdown();
-    s2aServer.awaitTermination(10, SECONDS);
     s2aServer.shutdown();
-    s2aDelayServer.awaitTermination(10, SECONDS);
     s2aDelayServer.shutdown();
-    mtlsS2AServer.awaitTermination(10, SECONDS);
     mtlsS2AServer.shutdown();
+
+    server.awaitTermination(10, SECONDS);
+    s2aServer.awaitTermination(10, SECONDS);
+    s2aDelayServer.awaitTermination(10, SECONDS);
+    mtlsS2AServer.awaitTermination(10, SECONDS);
   }
 
   @Test