DBZ-6133 Wait for test container ready message

debezium · Jun 20, 2023 · 2b52048 · 2b52048
1 parent 7f6ed72
commit 2b52048
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 2 deletions.
diff --git a/debezium-server-bom/pom.xml b/debezium-server-bom/pom.xml
@@ -20,6 +20,9 @@
         <version.nats>2.16.3</version.nats>
         <version.stan>2.2.3</version.stan>
         <version.commons.logging>1.2</version.commons.logging>
+
+        <!-- Testing -->
+        <version.junit.pioneer>2.0.1</version.junit.pioneer>
     </properties>
 
     <dependencyManagement>
@@ -256,6 +259,13 @@
                 <scope>import</scope>
             </dependency>
 
+            <!-- Testing -->
+            <dependency>
+                <groupId>org.junit-pioneer</groupId>
+                <artifactId>junit-pioneer</artifactId>
+                <version>${version.junit.pioneer}</version>
+                <scope>test</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>
diff --git a/debezium-server-redis/pom.xml b/debezium-server-redis/pom.xml
@@ -33,6 +33,11 @@
             <artifactId>quarkus-junit5</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit-pioneer</groupId>
+            <artifactId>junit-pioneer</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>io.debezium</groupId>
             <artifactId>debezium-testing-testcontainers</artifactId>

diff --git a/...er-redis/src/test/java/io/debezium/server/redis/RedisSSLTestResourceLifecycleManager.java b/...er-redis/src/test/java/io/debezium/server/redis/RedisSSLTestResourceLifecycleManager.java
@@ -31,6 +31,7 @@ public class RedisSSLTestResourceLifecycleManager implements QuarkusTestResource
     private static synchronized void start(boolean ignored) {
         if (!running.get()) {
             container.start();
+            TestUtils.waitBoolean(() -> container.getLogs().contains(RedisTestResourceLifecycleManager.READY_MESSAGE));
             running.set(true);
         }
     }

diff --git a/debezium-server-redis/src/test/java/io/debezium/server/redis/RedisSchemaHistoryIT.java b/debezium-server-redis/src/test/java/io/debezium/server/redis/RedisSchemaHistoryIT.java
@@ -12,6 +12,7 @@
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junitpioneer.jupiter.RetryingTest;
 
 import io.debezium.config.Configuration;
 import io.debezium.connector.mysql.MySqlConnection;
@@ -86,7 +87,7 @@ public void shouldRecordChangesAndRecoverToVariousPoints() {
     * 2. Create a new table named redis_test in MySQL
     * 3. Bring Redis up again and make sure the database schema  has been written successfully
     */
-    @Test
+    @RetryingTest(3)
     @FixFor("DBZ-4509")
     public void testRedisConnectionRetry() throws Exception {
         Testing.Print.enable();

diff --git a/...erver-redis/src/test/java/io/debezium/server/redis/RedisTestResourceLifecycleManager.java b/...erver-redis/src/test/java/io/debezium/server/redis/RedisTestResourceLifecycleManager.java
@@ -17,6 +17,7 @@
 
 public class RedisTestResourceLifecycleManager implements QuarkusTestResourceLifecycleManager {
 
+    static final String READY_MESSAGE = "Ready to accept connections";
     public static final int REDIS_PORT = 6379;
     public static final String REDIS_IMAGE = "redis";
 
@@ -27,6 +28,7 @@ public class RedisTestResourceLifecycleManager implements QuarkusTestResourceLif
     private static synchronized void start(boolean ignored) {
         if (!running.get()) {
             container.start();
+            TestUtils.waitBoolean(() -> container.getLogs().contains(READY_MESSAGE));
             running.set(true);
         }
     }

diff --git a/debezium-server-redis/src/test/java/io/debezium/server/redis/TestUtils.java b/debezium-server-redis/src/test/java/io/debezium/server/redis/TestUtils.java
@@ -40,7 +40,7 @@ public static void awaitHashSizeGte(Jedis jedis, String hashName, int expectedSi
         waitBoolean(() -> jedis.hgetAll(hashName).size() >= expectedSize);
     }
 
-    private static void waitBoolean(Supplier<Boolean> bool) {
+    public static void waitBoolean(Supplier<Boolean> bool) {
         Awaitility.await().atMost(Duration.ofSeconds(TestConfigSource.waitForSeconds())).until(() -> {
             return Boolean.TRUE.equals(bool.get());
         });