Skip to content

netty: add timeouts to address test flakiness #3169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zpencer merged 3 commits into from
Jul 18, 2017
Merged

netty: add timeouts to address test flakiness #3169

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d09814a
netty: fix basicStream flakey test
zpencer Jun 30, 2017
ceca670
netty: fix clientCancelFromWithinMessageRead flakey test
zpencer Jun 30, 2017
a1e2a06
remove sync()
zpencer Jun 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions testing/src/main/java/io/grpc/internal/testing/AbstractTransportTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,7 +646,7 @@ public void basicStream() throws Exception {
StreamCreation serverStreamCreation
= serverTransportListener.takeStreamOrFail(TIMEOUT_MS, TimeUnit.MILLISECONDS);
if (metricsExpected()) {
clientInOrder.verify(clientStreamTracer).outboundHeaders();
verify(clientStreamTracer, timeout(TIMEOUT_MS)).outboundHeaders();
}
assertEquals(methodDescriptor.getFullMethodName(), serverStreamCreation.method);
assertEquals(Lists.newArrayList(clientHeadersCopy.getAll(asciiKey)),
Expand Down Expand Up @@ -1033,7 +1033,7 @@ public void onReady() {
verify(serverStreamTracer, atLeast(1)).outboundUncompressedSize(anyLong());
// There is a race between client cancelling and server closing. The final status seen by the
// server is non-deterministic.
verify(serverStreamTracer).streamClosed(any(Status.class));
verify(serverStreamTracer, timeout(TIMEOUT_MS)).streamClosed(any(Status.class));
verifyNoMoreInteractions(clientStreamTracer);
verifyNoMoreInteractions(serverStreamTracer);
}
Expand Down