grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

netty: add timeouts to address test flakiness (#3169) 

This test is sometimes flakey
This commit is contained in:
zpencer 2017-07-17 17:14:16 -07:00 committed by GitHub
parent 6ea2b8aacb
commit e14fc404f0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
testing/src/main/java/io/grpc/internal/testing/AbstractTransportTest.java
View File

@ -646,7 +646,7 @@ public abstract class AbstractTransportTest {
StreamCreation serverStreamCreation StreamCreation serverStreamCreation
= serverTransportListener.takeStreamOrFail(TIMEOUT_MS, TimeUnit.MILLISECONDS); = serverTransportListener.takeStreamOrFail(TIMEOUT_MS, TimeUnit.MILLISECONDS);
if (metricsExpected()) { if (metricsExpected()) {
clientInOrder.verify(clientStreamTracer).outboundHeaders(); verify(clientStreamTracer, timeout(TIMEOUT_MS)).outboundHeaders();
} }
assertEquals(methodDescriptor.getFullMethodName(), serverStreamCreation.method); assertEquals(methodDescriptor.getFullMethodName(), serverStreamCreation.method);
assertEquals(Lists.newArrayList(clientHeadersCopy.getAll(asciiKey)), assertEquals(Lists.newArrayList(clientHeadersCopy.getAll(asciiKey)),
@ -1033,7 +1033,7 @@ public abstract class AbstractTransportTest {
verify(serverStreamTracer, atLeast(1)).outboundUncompressedSize(anyLong()); verify(serverStreamTracer, atLeast(1)).outboundUncompressedSize(anyLong());
// There is a race between client cancelling and server closing. The final status seen by the // There is a race between client cancelling and server closing. The final status seen by the
// server is non-deterministic. // server is non-deterministic.
verify(serverStreamTracer).streamClosed(any(Status.class)); verify(serverStreamTracer, timeout(TIMEOUT_MS)).streamClosed(any(Status.class));
verifyNoMoreInteractions(clientStreamTracer); verifyNoMoreInteractions(clientStreamTracer);
verifyNoMoreInteractions(serverStreamTracer); verifyNoMoreInteractions(serverStreamTracer);
} }