Skip to content

Commit 7ccb450

Browse files
eddumelendezeddumelendez
committed
Fix waitStrategy
1 parent f9bca0d commit 7ccb450

File tree

13 files changed

+44
-30
lines changed

13 files changed

+44
-30
lines changed

‎modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseContainer.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,12 @@ public ClickHouseContainer(final DockerImageName dockerImageName) {
5050
dockerImageName.assertCompatibleWith(CLICKHOUSE_IMAGE_NAME);
5151

5252
addExposedPorts(HTTP_PORT, NATIVE_PORT);
53-
this.waitStrategy =
53+
setWaitStrategy(
5454
new HttpWaitStrategy()
5555
.forStatusCode(200)
5656
.forResponsePredicate("Ok."::equals)
57-
.withStartupTimeout(Duration.ofMinutes(1));
57+
.withStartupTimeout(Duration.ofMinutes(1))
58+
);
5859
}
5960

6061
@Override

‎modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,12 @@ public ClickHouseContainer(final DockerImageName dockerImageName) {
6565
supportsNewDriver = isNewDriverSupported(dockerImageName);
6666

6767
addExposedPorts(HTTP_PORT, NATIVE_PORT);
68-
this.waitStrategy =
68+
setWaitStrategy(
6969
new HttpWaitStrategy()
7070
.forStatusCode(200)
7171
.forResponsePredicate("Ok."::equals)
72-
.withStartupTimeout(Duration.ofMinutes(1));
72+
.withStartupTimeout(Duration.ofMinutes(1))
73+
);
7374
}
7475

7576
@Override

‎modules/cratedb/src/main/java/org/testcontainers/cratedb/CrateDBContainer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public CrateDBContainer(final DockerImageName dockerImageName) {
4747
dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
4848
withCommand("crate -C discovery.type=single-node");
4949

50-
this.waitStrategy = Wait.forHttp("/").forPort(CRATEDB_HTTP_PORT).forStatusCode(200);
50+
setWaitStrategy(Wait.forHttp("/").forPort(CRATEDB_HTTP_PORT).forStatusCode(200));
5151

5252
addExposedPort(CRATEDB_PG_PORT);
5353
addExposedPort(CRATEDB_HTTP_PORT);

‎modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,11 @@ public Db2Container(final DockerImageName dockerImageName) {
5858
dockerImageName.assertCompatibleWith(DEFAULT_NEW_IMAGE_NAME, DEFAULT_IMAGE_NAME);
5959

6060
withPrivilegedMode(true);
61-
this.waitStrategy =
61+
setWaitStrategy(
6262
new LogMessageWaitStrategy()
6363
.withRegEx(".*Setup has completed\\..*")
64-
.withStartupTimeout(Duration.of(10, ChronoUnit.MINUTES));
64+
.withStartupTimeout(Duration.of(10, ChronoUnit.MINUTES))
65+
);
6566

6667
addExposedPort(DB2_PORT);
6768
}

‎modules/influxdb/src/main/java/org/testcontainers/containers/InfluxDBContainer.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,12 @@ public InfluxDBContainer(final DockerImageName dockerImageName) {
8686
super(dockerImageName);
8787
dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
8888

89-
this.waitStrategy =
89+
setWaitStrategy(
9090
new HttpWaitStrategy()
9191
.forPath("/ping")
9292
.withBasicCredentials(this.username, this.password)
93-
.forStatusCode(NO_CONTENT_STATUS_CODE);
93+
.forStatusCode(NO_CONTENT_STATUS_CODE)
94+
);
9495

9596
this.isAtLeastMajorVersion2 =
9697
new ComparableVersion(dockerImageName.getVersionPart()).isGreaterThanOrEqualTo("2.0.0");

‎modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,12 @@ public Neo4jContainer(final DockerImageName dockerImageName) {
112112

113113
dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
114114

115-
this.waitStrategy =
115+
setWaitStrategy(
116116
new WaitAllStrategy()
117117
.withStrategy(WAIT_FOR_BOLT)
118118
.withStrategy(WAIT_FOR_HTTP)
119-
.withStartupTimeout(Duration.ofMinutes(2));
119+
.withStartupTimeout(Duration.ofMinutes(2))
120+
);
120121

121122
addExposedPorts(DEFAULT_BOLT_PORT, DEFAULT_HTTP_PORT, DEFAULT_HTTPS_PORT);
122123
}
@@ -176,11 +177,13 @@ private void configureWaitStrategy() {
176177
boolean onlyHttpExposed = !boltExposed && httpExposed;
177178

178179
if (onlyBoltExposed) {
179-
this.waitStrategy =
180-
new WaitAllStrategy().withStrategy(WAIT_FOR_BOLT).withStartupTimeout(Duration.ofMinutes(2));
180+
setWaitStrategy(
181+
new WaitAllStrategy().withStrategy(WAIT_FOR_BOLT).withStartupTimeout(Duration.ofMinutes(2))
182+
);
181183
} else if (onlyHttpExposed) {
182-
this.waitStrategy =
183-
new WaitAllStrategy().withStrategy(WAIT_FOR_HTTP).withStartupTimeout(Duration.ofMinutes(2));
184+
setWaitStrategy(
185+
new WaitAllStrategy().withStrategy(WAIT_FOR_HTTP).withStartupTimeout(Duration.ofMinutes(2))
186+
);
184187
}
185188
}
186189

‎modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,12 @@ public OracleContainer(Future<String> dockerImageName) {
8787
}
8888

8989
private void preconfigure() {
90-
this.waitStrategy =
90+
setWaitStrategy(
9191
new LogMessageWaitStrategy()
9292
.withRegEx(".*DATABASE IS READY TO USE!.*\\s")
9393
.withTimes(1)
94-
.withStartupTimeout(Duration.of(DEFAULT_STARTUP_TIMEOUT_SECONDS, ChronoUnit.SECONDS));
94+
.withStartupTimeout(Duration.of(DEFAULT_STARTUP_TIMEOUT_SECONDS, ChronoUnit.SECONDS))
95+
);
9596

9697
withConnectTimeoutSeconds(DEFAULT_CONNECT_TIMEOUT_SECONDS);
9798
addExposedPorts(ORACLE_PORT, APEX_HTTP_PORT);

‎modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,12 @@ public PostgreSQLContainer(final DockerImageName dockerImageName) {
5555
super(dockerImageName);
5656
dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
5757

58-
this.waitStrategy =
58+
setWaitStrategy(
5959
new LogMessageWaitStrategy()
6060
.withRegEx(".*database system is ready to accept connections.*\\s")
6161
.withTimes(2)
62-
.withStartupTimeout(Duration.of(60, ChronoUnit.SECONDS));
62+
.withStartupTimeout(Duration.of(60, ChronoUnit.SECONDS))
63+
);
6364
this.setCommand("postgres", "-c", FSYNC_OFF_OPTION);
6465

6566
addExposedPort(POSTGRESQL_PORT);

‎modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,11 @@ public PrestoContainer(final DockerImageName dockerImageName) {
4747
super(dockerImageName);
4848
dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
4949

50-
this.waitStrategy =
50+
setWaitStrategy(
5151
new LogMessageWaitStrategy()
5252
.withRegEx(".*======== SERVER STARTED ========.*")
53-
.withStartupTimeout(Duration.of(60, ChronoUnit.SECONDS));
53+
.withStartupTimeout(Duration.of(60, ChronoUnit.SECONDS))
54+
);
5455

5556
addExposedPort(PRESTO_PORT);
5657
}

‎modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,9 @@ public RabbitMQContainer(final DockerImageName dockerImageName) {
7676

7777
addExposedPorts(DEFAULT_AMQP_PORT, DEFAULT_AMQPS_PORT, DEFAULT_HTTP_PORT, DEFAULT_HTTPS_PORT);
7878

79-
this.waitStrategy =
80-
Wait.forLogMessage(".*Server startup complete.*", 1).withStartupTimeout(Duration.ofSeconds(60));
79+
setWaitStrategy(
80+
Wait.forLogMessage(".*Server startup complete.*", 1).withStartupTimeout(Duration.ofSeconds(60))
81+
);
8182
}
8283

8384
@Override

0 commit comments

Comments
 (0)