Skip to content

Commit

Permalink
fix: Increased testTimeouts to promote test success on GHA runners (#140
Browse files Browse the repository at this point in the history 
)

Signed-off-by: Matt Peterson <[email protected]>
  • Loading branch information
@mattp-swirldslabs
mattp-swirldslabs authored Aug 27, 2024
1 parent d00633e commit 5e05eaa
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 24 deletions.
2 changes: 1 addition & 1 deletion server/src/test/java/com/hedera/block/server/BlockStreamServiceIntegrationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ public class BlockStreamServiceIntegrationTest {
private BlockNodeContext blockNodeContext;
private PersistenceStorageConfig testConfig;

private static final int testTimeout = 200;
private static final int testTimeout = 1000;

@BeforeEach
public void setUp() throws IOException {
Expand Down
13 changes: 7 additions & 6 deletions server/src/test/java/com/hedera/block/server/BlockStreamServiceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.timeout;
import static org.mockito.Mockito.times;
Expand Down Expand Up @@ -89,6 +88,8 @@ public class BlockStreamServiceTest {

private static final String TEMP_DIR = "block-node-unit-test-dir";

private static final int testTimeout = 1000;

private Path testPath;
private BlockNodeContext blockNodeContext;
private PersistenceStorageConfig config;
Expand Down Expand Up @@ -120,7 +121,7 @@ public void testServiceName() throws IOException, NoSuchAlgorithmException {
assertEquals(Constants.SERVICE_NAME, blockStreamService.serviceName());

// Verify other methods not invoked
verify(streamMediator, never()).publish(any(BlockItem.class));
verify(streamMediator, timeout(testTimeout).times(0)).publish(any(BlockItem.class));
}

@Test
Expand All @@ -134,7 +135,7 @@ public void testProto() throws IOException, NoSuchAlgorithmException {
assertEquals(5, fileDescriptor.getServices().getFirst().getMethods().size());

// Verify other methods not invoked
verify(streamMediator, never()).publish(any(BlockItem.class));
verify(streamMediator, timeout(testTimeout).times(0)).publish(any(BlockItem.class));
}

@Test
Expand Down Expand Up @@ -280,13 +281,13 @@ public void testUpdateInvokesRoutingWithLambdas() {
GrpcService.Routing routing = mock(GrpcService.Routing.class);
blockStreamService.update(routing);

verify(routing, timeout(50).times(1))
verify(routing, timeout(testTimeout).times(1))
.bidi(eq(CLIENT_STREAMING_METHOD_NAME), any(ServerCalls.BidiStreamingMethod.class));
verify(routing, timeout(50).times(1))
verify(routing, timeout(testTimeout).times(1))
.serverStream(
eq(SERVER_STREAMING_METHOD_NAME),
any(ServerCalls.ServerStreamingMethod.class));
verify(routing, timeout(50).times(1))
verify(routing, timeout(testTimeout).times(1))
.unary(eq(SINGLE_BLOCK_METHOD_NAME), any(ServerCalls.UnaryMethod.class));
}

Expand Down
16 changes: 9 additions & 7 deletions ...er/src/test/java/com/hedera/block/server/consumer/ConsumerStreamResponseObserverTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import static com.hedera.block.server.util.PersistTestUtils.generateBlockItems;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.timeout;
import static org.mockito.Mockito.verify;
Expand Down Expand Up @@ -53,6 +52,8 @@ public class ConsumerStreamResponseObserverTest {
private final long TIMEOUT_THRESHOLD_MILLIS = 50L;
private final long TEST_TIME = 1_719_427_664_950L;

private static final int testTimeout = 1000;

@Mock private StreamMediator<BlockItem, ObjectEvent<SubscribeStreamResponse>> streamMediator;

@Mock
Expand Down Expand Up @@ -99,7 +100,8 @@ public void testProducerTimeoutWithinWindow() {
verify(responseStreamObserver).onNext(fromPbj(subscribeStreamResponse));

// verify the mediator is NOT called to unsubscribe the observer
verify(streamMediator, never()).unsubscribe(consumerBlockItemObserver);
verify(streamMediator, timeout(testTimeout).times(0))
.unsubscribe(consumerBlockItemObserver);
}

@Test
Expand Down Expand Up @@ -127,8 +129,8 @@ public void testHandlersSetOnObserver() throws InterruptedException {
new ConsumerStreamResponseObserver(
testContext, testClock, streamMediator, serverCallStreamObserver);

verify(serverCallStreamObserver, timeout(50).times(1)).setOnCloseHandler(any());
verify(serverCallStreamObserver, timeout(50).times(1)).setOnCancelHandler(any());
verify(serverCallStreamObserver, timeout(testTimeout).times(1)).setOnCloseHandler(any());
verify(serverCallStreamObserver, timeout(testTimeout).times(1)).setOnCancelHandler(any());
}

@Test
Expand All @@ -153,7 +155,7 @@ public void testResponseNotPermittedAfterCancel() {
consumerStreamResponseObserver.onEvent(objectEvent, 0, true);

// Confirm that canceling the observer allowed only 1 response to be sent.
verify(serverCallStreamObserver, timeout(50).times(1))
verify(serverCallStreamObserver, timeout(testTimeout).times(1))
.onNext(fromPbj(subscribeStreamResponse));
}

Expand All @@ -179,7 +181,7 @@ public void testResponseNotPermittedAfterClose() {
consumerStreamResponseObserver.onEvent(objectEvent, 0, true);

// Confirm that canceling the observer allowed only 1 response to be sent.
verify(serverCallStreamObserver, timeout(50).times(1))
verify(serverCallStreamObserver, timeout(testTimeout).times(1))
.onNext(fromPbj(subscribeStreamResponse));
}

Expand Down Expand Up @@ -221,7 +223,7 @@ public void testConsumerNotToSendBeforeBlockHeader() {

// Confirm that the observer was called with the next BlockItem
// since we never send a BlockItem with a Header to start the stream.
verify(responseStreamObserver, timeout(50).times(0))
verify(responseStreamObserver, timeout(testTimeout).times(0))
.onNext(fromPbj(subscribeStreamResponse));
}

Expand Down
2 changes: 1 addition & 1 deletion server/src/test/java/com/hedera/block/server/mediator/LiveStreamMediatorImplTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public class LiveStreamMediatorImplTest {
private final long TIMEOUT_THRESHOLD_MILLIS = 100L;
private final long TEST_TIME = 1_719_427_664_950L;

private static final int testTimeout = 200;
private static final int testTimeout = 1000;

private final BlockNodeContext testContext;

Expand Down
23 changes: 14 additions & 9 deletions server/src/test/java/com/hedera/block/server/producer/ProducerBlockItemObserverTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ public class ProducerBlockItemObserverTest {

@Mock private ServiceStatus serviceStatus;
@Mock private InstantSource testClock;
private static final int testTimeout = 1000;

@Test
public void testProducerOnNext() throws IOException, NoSuchAlgorithmException {
Expand All @@ -99,19 +100,19 @@ public void testProducerOnNext() throws IOException, NoSuchAlgorithmException {
PublishStreamRequest.newBuilder().blockItem(blockHeader).build();
producerBlockItemObserver.onNext(fromPbj(publishStreamRequest));

verify(streamMediator, timeout(50).times(1)).publish(blockHeader);
verify(streamMediator, timeout(testTimeout).times(1)).publish(blockHeader);

final Acknowledgement ack = buildAck(blockHeader);
final PublishStreamResponse publishStreamResponse =
PublishStreamResponse.newBuilder().acknowledgement(ack).build();

verify(publishStreamResponseObserver, timeout(50).times(1))
verify(publishStreamResponseObserver, timeout(testTimeout).times(1))
.onNext(fromPbj(publishStreamResponse));

// Helidon will call onCompleted after onNext
producerBlockItemObserver.onCompleted();

verify(publishStreamResponseObserver, timeout(50).times(1)).onCompleted();
verify(publishStreamResponseObserver, timeout(testTimeout).times(1)).onCompleted();
}

@Test
Expand Down Expand Up @@ -181,9 +182,12 @@ blockWriter, blockNodeContext, new ServiceStatusImpl())
assertEquals(1, blockNodeContext.metricsService().liveBlockItems.get());

// Confirm each subscriber was notified of the new block
verify(streamObserver1, timeout(50).times(1)).onNext(fromPbj(subscribeStreamResponse));
verify(streamObserver2, timeout(50).times(1)).onNext(fromPbj(subscribeStreamResponse));
verify(streamObserver3, timeout(50).times(1)).onNext(fromPbj(subscribeStreamResponse));
verify(streamObserver1, timeout(testTimeout).times(1))
.onNext(fromPbj(subscribeStreamResponse));
verify(streamObserver2, timeout(testTimeout).times(1))
.onNext(fromPbj(subscribeStreamResponse));
verify(streamObserver3, timeout(testTimeout).times(1))
.onNext(fromPbj(subscribeStreamResponse));

// Confirm the BlockStorage write method was
// called despite the absence of subscribers
Expand Down Expand Up @@ -222,7 +226,8 @@ public void testItemAckBuilderExceptionTest() {
.build();
final PublishStreamResponse errorResponse =
PublishStreamResponse.newBuilder().status(endOfStream).build();
verify(publishStreamResponseObserver, timeout(50).times(1)).onNext(fromPbj(errorResponse));
verify(publishStreamResponseObserver, timeout(testTimeout).times(1))
.onNext(fromPbj(errorResponse));
}

@Test
Expand Down Expand Up @@ -262,10 +267,10 @@ public void testBlockItemThrowsParseException() throws InvalidProtocolBufferExce
fromPbj(PublishStreamResponse.newBuilder().status(endOfStream).build());

// verify the ProducerBlockItemObserver has sent an error response
verify(publishStreamResponseObserver, timeout(50).times(1))
verify(publishStreamResponseObserver, timeout(testTimeout).times(1))
.onNext(fromPbj(PublishStreamResponse.newBuilder().status(endOfStream).build()));

verify(serviceStatus, timeout(50).times(1)).stopWebServer();
verify(serviceStatus, timeout(testTimeout).times(1)).stopWebServer();
}

private static class TestProducerBlockItemObserver extends ProducerBlockItemObserver {
Expand Down

0 comments on commit 5e05eaa

Please sign in to comment.