fix travis test

YifeiZhuang · Dec 14, 2020 · eb18861 · eb18861
1 parent 1fe3bce
commit eb18861
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/core/src/main/java/io/grpc/internal/DelayedStream.java b/core/src/main/java/io/grpc/internal/DelayedStream.java
@@ -141,7 +141,7 @@ protected boolean isStreamTransferCompleted() {
 
   protected void awaitStreamTransferCompletion() {
     // Wait until accepted RPCs transfer to the real stream so that we can properly cancel or
-    // shutdown. Not waiting for transfer completion may cause pending calls orphaned. #636.
+    // shutdown. Not waiting for transfer completion may cause pending calls orphaned. #6283.
     boolean delegationComplete;
     try {
       delegationComplete = realStreamStarted.await(5, TimeUnit.SECONDS);

diff --git a/core/src/test/java/io/grpc/internal/DelayedClientTransportTest.java b/core/src/test/java/io/grpc/internal/DelayedClientTransportTest.java
@@ -720,15 +720,14 @@ public void run() {
       }
     };
     processThread.start();
-    assertEquals(1, delayedTransport.getPendingStreamsCount());//stream2
-    assertEquals(1, delayedTransport.getUncommittedStreamsCount());//stream1
     barrierSignal.await(5, TimeUnit.SECONDS);
     assertEquals(1, barrier.getNumberWaiting());
     delayedTransport.shutdownNow(SHUTDOWN_STATUS);
     assertFalse(delayedTransport.hasPendingStreams());
     assertFalse(delayedTransport.hasUncommittedStreams());
     assertFalse(Thread.interrupted());
     barrier.await(5, TimeUnit.SECONDS);
+    processThread.join(5000);
     assertSame(mockRealStream, stream1.getRealStream());
     assertTrue(stream2.getRealStream() instanceof NoopClientStream);
     verify(mockRealStream).start(any(ClientStreamListener.class));