Skip to content

IT: fix flaky BrokerSessionIT #77

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

Open
678098 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

IT: fix flaky BrokerSessionIT #77

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 17 additions & 1 deletion bmq-sdk/src/test/java/com/bloomberg/bmq/it/BrokerSessionIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
import java.util.concurrent.SynchronousQueue;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.function.BooleanSupplier;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
Expand All @@ -98,6 +99,18 @@ public class BrokerSessionIT {

static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());

private static void waitUntil(BooleanSupplier condition, Duration timeout)
throws InterruptedException {
long deadlineMs = System.currentTimeMillis() + timeout.toMillis();
while (!condition.getAsBoolean()) {
long remaining = deadlineMs - System.currentTimeMillis();
if (remaining <= 0) {
throw new AssertionError("Condition not met within " + timeout);
}
Thread.sleep(Math.min(10, remaining));
}
}

private static Uri createUri() {
return BmqBroker.Domains.Priority.generateQueueUri();
}
Expand Down Expand Up @@ -464,7 +477,7 @@ void openConfigureCloseQueueTest() {
* </ul>
*/
@Test
void pushMessageTest() throws IOException {
void pushMessageTest() throws IOException, InterruptedException {
logger.info("#TEST_BEGIN BrokerSessionIT pushMessageTest");

BmqBrokerSimulator server = new BmqBrokerSimulator(Mode.BMQ_AUTO_MODE);
Expand Down Expand Up @@ -498,6 +511,9 @@ void pushMessageTest() throws IOException {

server.writePushRequest(1);

// Wait for the push event to be received before closing
waitUntil(() -> !events.isEmpty(), Duration.ofSeconds(3));

assertEquals(CloseQueueResult.SUCCESS, queue.close(TEST_REQUEST_TIMEOUT));
assertEquals(QueueState.e_CLOSED, queue.getState());
verifyConfigureRequest(++reqId, server.nextClientRequest());
Expand Down
Loading