From 36c47f2e501a44423c09e20af3f1890a8f90ea84 Mon Sep 17 00:00:00 2001 From: Dmytro Vyazelenko <696855+vyazelenko@users.noreply.github.com> Date: Wed, 3 Jan 2024 18:30:40 +0100 Subject: [PATCH] [Java] Increase default timeout to 10 seconds to account for slow DNS queries on MacOS. --- .../SessionSpecificSubscriptionTest.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/aeron-system-tests/src/test/java/io/aeron/SessionSpecificSubscriptionTest.java b/aeron-system-tests/src/test/java/io/aeron/SessionSpecificSubscriptionTest.java index 5406e15f97..a735a99a0f 100644 --- a/aeron-system-tests/src/test/java/io/aeron/SessionSpecificSubscriptionTest.java +++ b/aeron-system-tests/src/test/java/io/aeron/SessionSpecificSubscriptionTest.java @@ -50,6 +50,7 @@ import static org.mockito.Mockito.mock; @ExtendWith(InterruptingTestCallback.class) +@InterruptAfter(10) class SessionSpecificSubscriptionTest { private static final String ENDPOINT = "localhost:24325"; @@ -93,7 +94,6 @@ void after() driver.context().deleteDirectory(); } - @InterruptAfter(10) @ParameterizedTest @MethodSource("data") void shouldSubscribeToSpecificSessionIdsAndWildcard(final ChannelUriStringBuilder channelBuilder) @@ -184,7 +184,6 @@ void shouldNotSubscribeWithoutSpecificSession(final ChannelUriStringBuilder chan @ParameterizedTest @MethodSource("data") - @InterruptAfter(5) void shouldOnlySeeDataOnSpecificSessionWhenUsingTags(final ChannelUriStringBuilder channelBuilder) { final DirectBuffer liveBuffer = new UnsafeBuffer("live".getBytes(StandardCharsets.US_ASCII)); @@ -228,24 +227,25 @@ void shouldOnlySeeDataOnSpecificSessionWhenUsingTags(final ChannelUriStringBuild final long deadlineMs = System.currentTimeMillis() + 2_000; final IdleStrategy idleStrategy = new YieldingIdleStrategy(); - int fragments = 0; - while (System.currentTimeMillis() < deadlineMs) + final FragmentHandler fragmentHandler = (buffer, offset, length, header) -> { - fragments += tagOnlySub.poll( - (buffer, offset, length, header) -> - { - final String s = buffer.getStringWithoutLengthAscii(offset, length); - if ("ignored".equals(s)) - { - isValid.set(false); - } - }, 10); + final String s = buffer.getStringWithoutLengthAscii(offset, length); + if ("ignored".equals(s)) + { + isValid.set(false); + } + }; + int totalFragments = 0; + while (System.currentTimeMillis() < deadlineMs) + { + final int fragments = tagOnlySub.poll(fragmentHandler, 10); + totalFragments += fragments; idleStrategy.idle(fragments); } assertTrue(isValid.get()); - assertEquals(1, fragments); + assertEquals(1, totalFragments); } }