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

De-flake transport test. 

See #289 for more detail.

I can't reproduce the failure locally, so my guess is that our TIMEOUT is too short for Travis, when the Travis machines get high CPU usage or short of memory (and causes full GC), we should tolerate longer waiting time.

I'm not sure whether this change can fix the flakeness, but I'd like to give it a try.
This commit is contained in:
Xudong Ma 2015-04-14 18:24:49 +08:00
parent 5b2e336b6f
commit 1066222eba
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
integration-testing/src/main/java/io/grpc/testing/integration/AbstractTransportTest.java
View File

@ -88,6 +88,7 @@ public abstract class AbstractTransportTest {
ProtoUtils.keyForProto(Messages.SimpleContext.getDefaultInstance()); ProtoUtils.keyForProto(Messages.SimpleContext.getDefaultInstance());
private static ScheduledExecutorService testServiceExecutor; private static ScheduledExecutorService testServiceExecutor;
private static ServerImpl server; private static ServerImpl server;
private static int OPERATION_TIMEOUT = 5000;
protected static void startStaticServer(AbstractServerBuilder<?> builder) { protected static void startStaticServer(AbstractServerBuilder<?> builder) {
testServiceExecutor = Executors.newScheduledThreadPool(2); testServiceExecutor = Executors.newScheduledThreadPool(2);
@ -280,11 +281,11 @@ public abstract class AbstractTransportTest {
= asyncStub.fullDuplexCall(responseObserver); = asyncStub.fullDuplexCall(responseObserver);
for (int i = 0; i < requests.size(); i++) { for (int i = 0; i < requests.size(); i++) {
requestObserver.onValue(requests.get(i)); requestObserver.onValue(requests.get(i));
verify(responseObserver, timeout(1000)).onValue(goldenResponses.get(i)); verify(responseObserver, timeout(OPERATION_TIMEOUT)).onValue(goldenResponses.get(i));
verifyNoMoreInteractions(responseObserver); verifyNoMoreInteractions(responseObserver);
} }
requestObserver.onCompleted(); requestObserver.onCompleted();
verify(responseObserver, timeout(1000)).onCompleted(); verify(responseObserver, timeout(OPERATION_TIMEOUT)).onCompleted();
verifyNoMoreInteractions(responseObserver); verifyNoMoreInteractions(responseObserver);
} }
@ -295,7 +296,7 @@ public abstract class AbstractTransportTest {
StreamObserver<StreamingOutputCallRequest> requestObserver StreamObserver<StreamingOutputCallRequest> requestObserver
= asyncStub.fullDuplexCall(responseObserver); = asyncStub.fullDuplexCall(responseObserver);
requestObserver.onCompleted(); requestObserver.onCompleted();
verify(responseObserver, timeout(1000)).onCompleted(); verify(responseObserver, timeout(OPERATION_TIMEOUT)).onCompleted();
verifyNoMoreInteractions(responseObserver); verifyNoMoreInteractions(responseObserver);
} }
@ -329,12 +330,12 @@ public abstract class AbstractTransportTest {
StreamObserver<StreamingOutputCallRequest> requestObserver StreamObserver<StreamingOutputCallRequest> requestObserver
= asyncStub.fullDuplexCall(responseObserver); = asyncStub.fullDuplexCall(responseObserver);
requestObserver.onValue(request); requestObserver.onValue(request);
verify(responseObserver, timeout(1000)).onValue(goldenResponse); verify(responseObserver, timeout(OPERATION_TIMEOUT)).onValue(goldenResponse);
verifyNoMoreInteractions(responseObserver); verifyNoMoreInteractions(responseObserver);
requestObserver.onError(new RuntimeException()); requestObserver.onError(new RuntimeException());
ArgumentCaptor<Throwable> captor = ArgumentCaptor.forClass(Throwable.class); ArgumentCaptor<Throwable> captor = ArgumentCaptor.forClass(Throwable.class);
verify(responseObserver, timeout(1000)).onError(captor.capture()); verify(responseObserver, timeout(OPERATION_TIMEOUT)).onError(captor.capture());
assertEquals(Status.CANCELLED, Status.fromThrowable(captor.getValue())); assertEquals(Status.CANCELLED, Status.fromThrowable(captor.getValue()));
verifyNoMoreInteractions(responseObserver); verifyNoMoreInteractions(responseObserver);
} }
@ -445,7 +446,7 @@ public abstract class AbstractTransportTest {
// Time how long it takes to get the first response. // Time how long it takes to get the first response.
call.request(1); call.request(1);
assertEquals(goldenResponses.get(0), queue.poll(1, TimeUnit.SECONDS)); assertEquals(goldenResponses.get(0), queue.poll(OPERATION_TIMEOUT, TimeUnit.MILLISECONDS));
long firstCallDuration = System.nanoTime() - start; long firstCallDuration = System.nanoTime() - start;
// Without giving additional flow control, make sure that we don't get another response. We wait // Without giving additional flow control, make sure that we don't get another response. We wait
@ -457,8 +458,8 @@ public abstract class AbstractTransportTest {
// Make sure that everything still completes. // Make sure that everything still completes.
call.request(1); call.request(1);
assertEquals(goldenResponses.get(1), queue.poll(1, TimeUnit.SECONDS)); assertEquals(goldenResponses.get(1), queue.poll(OPERATION_TIMEOUT, TimeUnit.MILLISECONDS));
assertEquals(Status.OK, queue.poll(1, TimeUnit.SECONDS)); assertEquals(Status.OK, queue.poll(OPERATION_TIMEOUT, TimeUnit.MILLISECONDS));
} }
@Test(timeout = 30000) @Test(timeout = 30000)