Skip to content

Commit 1231a12

Browse files
authored
Use awaitility in Kafka module (#9248)
Remove usage of `Unreliables` from `duct-tape` lib.
1 parent f763945 commit 1231a12

File tree

2 files changed

+7
-13
lines changed

2 files changed

+7
-13
lines changed

modules/kafka/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ dependencies {
66
testImplementation 'org.apache.kafka:kafka-clients:3.8.0'
77
testImplementation 'org.assertj:assertj-core:3.26.3'
88
testImplementation 'com.google.guava:guava:23.0'
9+
testImplementation 'org.awaitility:awaitility:4.2.0'
910
}

modules/kafka/src/test/java/org/testcontainers/AbstractKafka.java

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import org.apache.kafka.common.config.SaslConfigs;
1515
import org.apache.kafka.common.serialization.StringDeserializer;
1616
import org.apache.kafka.common.serialization.StringSerializer;
17-
import org.rnorth.ducttape.unreliables.Unreliables;
17+
import org.awaitility.Awaitility;
1818

1919
import java.time.Duration;
2020
import java.util.Collection;
@@ -101,24 +101,17 @@ protected void testKafkaFunctionality(String bootstrapServers, boolean authentic
101101

102102
producer.send(new ProducerRecord<>(topicName, "testcontainers", "rulezzz")).get();
103103

104-
Unreliables.retryUntilTrue(
105-
10,
106-
TimeUnit.SECONDS,
107-
() -> {
104+
Awaitility
105+
.await()
106+
.atMost(Duration.ofSeconds(10))
107+
.untilAsserted(() -> {
108108
ConsumerRecords<String, String> records = consumer.poll(Duration.ofMillis(100));
109109

110-
if (records.isEmpty()) {
111-
return false;
112-
}
113-
114110
assertThat(records)
115111
.hasSize(1)
116112
.extracting(ConsumerRecord::topic, ConsumerRecord::key, ConsumerRecord::value)
117113
.containsExactly(tuple(topicName, "testcontainers", "rulezzz"));
118-
119-
return true;
120-
}
121-
);
114+
});
122115

123116
consumer.unsubscribe();
124117
}

0 commit comments

Comments
 (0)