Wait at most for 5s for an empty topic Speedup KafkaBrokerApiTest execution by waiting for at most 5s for the topic to be empty without more messages being received. Change-Id: I3ca3351230b2f77e9e5879a416df50a677404528
diff --git a/src/test/java/com/googlesource/gerrit/plugins/kafka/api/KafkaBrokerApiTest.java b/src/test/java/com/googlesource/gerrit/plugins/kafka/api/KafkaBrokerApiTest.java index c2bb692..5a85b81 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/kafka/api/KafkaBrokerApiTest.java +++ b/src/test/java/com/googlesource/gerrit/plugins/kafka/api/KafkaBrokerApiTest.java
@@ -67,8 +67,9 @@ private static final int TEST_POLLING_INTERVAL_MSEC = 100; private static final int TEST_THREAD_POOL_SIZE = 10; private static final UUID TEST_INSTANCE_ID = UUID.randomUUID(); - private static final TimeUnit TEST_TIMOUT_UNIT = TimeUnit.SECONDS; + private static final TimeUnit TEST_TIMEOUT_UNIT = TimeUnit.SECONDS; private static final int TEST_TIMEOUT = 30; + private static final int TEST_WAIT_FOR_MORE_MESSAGES_TIMEOUT = 5; private Injector injector; private KafkaSession session; @@ -128,8 +129,12 @@ } public boolean await() { + return await(TEST_TIMEOUT, TEST_TIMEOUT_UNIT); + } + + public boolean await(long timeout, TimeUnit unit) { try { - return lock.await(TEST_TIMEOUT, TEST_TIMOUT_UNIT); + return lock.await(timeout, unit); } catch (InterruptedException e) { return false; } @@ -218,6 +223,7 @@ private void assertNoMoreExpectedMessages(TestConsumer testConsumer) { testConsumer.resetExpectedMessages(1); - assertThat(testConsumer.await()).isFalse(); + assertThat(testConsumer.await(TEST_WAIT_FOR_MORE_MESSAGES_TIMEOUT, TEST_TIMEOUT_UNIT)) + .isFalse(); } }