Fix aarch64 emulation-triggered flakes
Because we are emulating aarch64 during testing the tests run slower
than normal. Bumping the timeout seems easy and obvious for
StressTestClientTest. The warmup for BinlogHelperTest mirrors what we've
done with timing-based tests in the past. Hopefully that is enough to
lower variance so that it passes consistently; seems likely. I'd rather
not increase the timing fuzziness if I can avoid it, as that reduces the
test's ability to detect issues.
Fixes #8135 (mostly+hopefully)
diff --git a/interop-testing/src/test/java/io/grpc/testing/integration/StressTestClientTest.java b/interop-testing/src/test/java/io/grpc/testing/integration/StressTestClientTest.java
index c1f193b..f32d00a 100644
--- a/interop-testing/src/test/java/io/grpc/testing/integration/StressTestClientTest.java
+++ b/interop-testing/src/test/java/io/grpc/testing/integration/StressTestClientTest.java
@@ -45,7 +45,7 @@
public class StressTestClientTest {
@Rule
- public final Timeout globalTimeout = Timeout.seconds(5);
+ public final Timeout globalTimeout = Timeout.seconds(10);
@Test
public void ipv6AddressesShouldBeSupported() {
diff --git a/services/src/test/java/io/grpc/protobuf/services/BinlogHelperTest.java b/services/src/test/java/io/grpc/protobuf/services/BinlogHelperTest.java
index 15c1444..37e503c 100644
--- a/services/src/test/java/io/grpc/protobuf/services/BinlogHelperTest.java
+++ b/services/src/test/java/io/grpc/protobuf/services/BinlogHelperTest.java
@@ -928,11 +928,6 @@
@Test
public void serverDeadlineLogged() {
- final AtomicReference<ServerCall<byte[], byte[]>> interceptedCall =
- new AtomicReference<>();
- @SuppressWarnings("unchecked")
- final ServerCall.Listener<byte[]> mockListener = mock(ServerCall.Listener.class);
-
final MethodDescriptor<byte[], byte[]> method =
MethodDescriptor.<byte[], byte[]>newBuilder()
.setType(MethodType.UNKNOWN)
@@ -940,6 +935,25 @@
.setRequestMarshaller(BYTEARRAY_MARSHALLER)
.setResponseMarshaller(BYTEARRAY_MARSHALLER)
.build();
+ final ServerCall<byte[], byte[]> noopServerCall = new NoopServerCall<byte[], byte[]>() {
+ @Override
+ public MethodDescriptor<byte[], byte[]> getMethodDescriptor() {
+ return method;
+ }
+ };
+ final ServerCallHandler<byte[], byte[]> noopHandler = new ServerCallHandler<byte[], byte[]>() {
+ @Override
+ public ServerCall.Listener<byte[]> startCall(
+ ServerCall<byte[], byte[]> call,
+ Metadata headers) {
+ return new ServerCall.Listener<byte[]>() {};
+ }
+ };
+
+ // Warm-up JVM
+ new BinlogHelper(mock(SinkWriter.class))
+ .getServerInterceptor(1234)
+ .interceptCall(noopServerCall, new Metadata(), noopHandler);
// We expect the contents of the "grpc-timeout" header to be installed the context
Context.current()
@@ -950,23 +964,7 @@
ServerCall.Listener<byte[]> unused =
new BinlogHelper(mockSinkWriter)
.getServerInterceptor(CALL_ID)
- .interceptCall(
- new NoopServerCall<byte[], byte[]>() {
- @Override
- public MethodDescriptor<byte[], byte[]> getMethodDescriptor() {
- return method;
- }
- },
- new Metadata(),
- new ServerCallHandler<byte[], byte[]>() {
- @Override
- public ServerCall.Listener<byte[]> startCall(
- ServerCall<byte[], byte[]> call,
- Metadata headers) {
- interceptedCall.set(call);
- return mockListener;
- }
- });
+ .interceptCall(noopServerCall, new Metadata(), noopHandler);
}
});
ArgumentCaptor<Duration> timeoutCaptor = ArgumentCaptor.forClass(Duration.class);
