Skip to content

Commit 27b382e

Browse files
larry-safrankannanjgithub
authored andcommitted
Fix slow tests that took 40 seconds to get through tearDown. (grpc#11530)
1 parent d940507 commit 27b382e

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

s2a/src/test/java/io/grpc/s2a/handshaker/IntegrationTest.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,14 +180,15 @@ public void setUp() throws Exception {
180180

181181
@After
182182
public void tearDown() throws Exception {
183-
server.awaitTermination(10, SECONDS);
184183
server.shutdown();
185-
s2aServer.awaitTermination(10, SECONDS);
186184
s2aServer.shutdown();
187-
s2aDelayServer.awaitTermination(10, SECONDS);
188185
s2aDelayServer.shutdown();
189-
mtlsS2AServer.awaitTermination(10, SECONDS);
190186
mtlsS2AServer.shutdown();
187+
188+
server.awaitTermination(10, SECONDS);
189+
s2aServer.awaitTermination(10, SECONDS);
190+
s2aDelayServer.awaitTermination(10, SECONDS);
191+
mtlsS2AServer.awaitTermination(10, SECONDS);
191192
}
192193

193194
@Test

0 commit comments

Comments
 (0)