diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java index 4824654957f..4e4c4c9d4b0 100644 --- a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java +++ b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java @@ -149,6 +149,9 @@ public SELF withPassword(final String password) { @Override protected void waitUntilContainerStarted() { + // Same gate as the non-deprecated container: strategy first, then the + // JDBC readiness check from JdbcDatabaseContainer. See issue #11981. getWaitStrategy().waitUntilReady(this); + super.waitUntilContainerStarted(); } } diff --git a/modules/postgresql/src/main/java/org/testcontainers/postgresql/PostgreSQLContainer.java b/modules/postgresql/src/main/java/org/testcontainers/postgresql/PostgreSQLContainer.java index 27521487a23..91dfc30b28a 100644 --- a/modules/postgresql/src/main/java/org/testcontainers/postgresql/PostgreSQLContainer.java +++ b/modules/postgresql/src/main/java/org/testcontainers/postgresql/PostgreSQLContainer.java @@ -139,6 +139,12 @@ public PostgreSQLContainer withPassword(final String password) { @Override protected void waitUntilContainerStarted() { + // Run the configured wait strategy first (defaults to the log-output + // strategy), then the JDBC readiness gate from JdbcDatabaseContainer: + // a real host-side connection running the test query. The log line + // alone can precede mapped-port reachability on Docker Desktop/Colima, + // giving Connection refused on first connect. See issue #11981. getWaitStrategy().waitUntilReady(this); + super.waitUntilContainerStarted(); } }