This is an automated email from the ASF dual-hosted git repository.
jstastnycz pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-kie-kogito-apps.git
The following commit(s) were added to refs/heads/main by this push:
new 1a80a8371 kie-issues#746: set timeout for testcontainers after
waitingFor invocation (#1932)
1a80a8371 is described below
commit 1a80a8371bcc9395b6eb35f53126e58c47c94566
Author: Jan Stastny <[email protected]>
AuthorDate: Thu Dec 7 11:25:10 2023 +0100
kie-issues#746: set timeout for testcontainers after waitingFor invocation
(#1932)
Co-authored-by: jstastny-cz <[email protected]>
---
.../java/org/kie/kogito/test/resources/CompositeTestResource.java | 3 ++-
.../main/java/org/kie/kogito/testcontainers/JobServiceContainer.java | 2 +-
.../testcontainers/ExplainabilityServiceMessagingContainer.java | 2 +-
.../kie/kogito/testcontainers/InfinispanTrustyServiceContainer.java | 2 +-
.../org/kie/kogito/testcontainers/QuarkusKogitoServiceContainer.java | 2 +-
.../kie/kogito/testcontainers/SpringBootKogitoServiceContainer.java | 2 +-
.../org/kie/kogito/index/postgresql/schema/DDLSchemaExporter.java | 3 ++-
.../kie/kogito/index/test/containers/AbstractDataIndexContainer.java | 3 ++-
.../index/test/quarkus/http/DataIndexPostgreSqlHttpResource.java | 3 ++-
.../index/test/quarkus/kafka/DataIndexOracleKafkaResource.java | 3 ++-
.../index/test/quarkus/kafka/DataIndexPostgreSqlKafkaResource.java | 5 +++--
.../java/org/kie/kogito/persistence/schema/DDLSchemaExporter.java | 3 ++-
.../java/org/kie/kogito/persistence/schema/DDLSchemaExporter.java | 3 ++-
13 files changed, 22 insertions(+), 14 deletions(-)
diff --git
a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/test/resources/CompositeTestResource.java
b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/test/resources/CompositeTestResource.java
index a8da66f8e..802896bb4 100644
---
a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/test/resources/CompositeTestResource.java
+++
b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/test/resources/CompositeTestResource.java
@@ -29,6 +29,7 @@ import java.util.Map;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import org.kie.kogito.testcontainers.Constants;
import org.kie.kogito.testcontainers.KogitoGenericContainer;
import org.kie.kogito.testcontainers.KogitoKafkaContainer;
import org.kie.kogito.testcontainers.KogitoPostgreSqlContainer;
@@ -94,7 +95,7 @@ public class CompositeTestResource implements TestResource {
final Network network = Network.newNetwork();
sharedDependencyContainers.values().stream()
.map(c -> c.withNetwork(network))
- .map(c -> c.waitingFor(Wait.forListeningPort()))
+ .map(c ->
c.waitingFor(Wait.forListeningPort()).withStartupTimeout(Constants.CONTAINER_START_TIMEOUT))
.forEach(GenericContainer::start);
configureKafkaToService(sharedDependencyContainers.values(),
serviceContainers.values().toArray(GenericContainer[]::new));
startServices(network);
diff --git
a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/testcontainers/JobServiceContainer.java
b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/testcontainers/JobServiceContainer.java
index 3d6d2521b..9781a04b4 100644
---
a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/testcontainers/JobServiceContainer.java
+++
b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/testcontainers/JobServiceContainer.java
@@ -29,7 +29,7 @@ public class JobServiceContainer extends
KogitoGenericContainer<JobServiceContai
public JobServiceContainer() {
super(NAME);
addExposedPort(PORT);
- waitingFor(Wait.forHttp("/q/health/live").forStatusCode(200));
+
waitingFor(Wait.forHttp("/q/health/live").forStatusCode(200)).withStartupTimeout(Constants.CONTAINER_START_TIMEOUT);
addEnv("QUARKUS_HTTP_PORT", Integer.toString(PORT));
addEnv("QUARKUS_LOG_CATEGORY__ORG_KIE_KOGITO_JOBS_SERVICE__LEVEL",
"DEBUG");
withAccessToHost(true);
diff --git
a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-common/src/main/java/org/kie/kogito/testcontainers/ExplainabilityServiceMessagingContainer.java
b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-common/src/main/java/org/kie/kogito/testcontainers/ExplainabilityServiceMessagingContainer.java
index 4776beec9..0502d26c9 100644
---
a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-common/src/main/java/org/kie/kogito/testcontainers/ExplainabilityServiceMessagingContainer.java
+++
b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-common/src/main/java/org/kie/kogito/testcontainers/ExplainabilityServiceMessagingContainer.java
@@ -27,6 +27,6 @@ public class ExplainabilityServiceMessagingContainer extends
KogitoGenericContai
addEnv("KAFKA_BOOTSTRAP_SERVERS", kafkaBootstrapServers);
addEnv("TRUSTY_EXPLAINABILITY_NUMBEROFSAMPLES",
String.valueOf(numberOfSamples));
addExposedPort(8080);
- waitingFor(Wait.forListeningPort());
+
waitingFor(Wait.forListeningPort()).withStartupTimeout(Constants.CONTAINER_START_TIMEOUT);
}
}
diff --git
a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-common/src/main/java/org/kie/kogito/testcontainers/InfinispanTrustyServiceContainer.java
b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-common/src/main/java/org/kie/kogito/testcontainers/InfinispanTrustyServiceContainer.java
index 79fcf5f15..5e92b2b15 100644
---
a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-common/src/main/java/org/kie/kogito/testcontainers/InfinispanTrustyServiceContainer.java
+++
b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-common/src/main/java/org/kie/kogito/testcontainers/InfinispanTrustyServiceContainer.java
@@ -29,6 +29,6 @@ public class InfinispanTrustyServiceContainer extends
KogitoGenericContainer<Inf
addEnv("KAFKA_BOOTSTRAP_SERVERS", kafkaBootstrapServer);
addEnv("TRUSTY_EXPLAINABILITY_ENABLED",
String.valueOf(explainabilityEnabled));
addExposedPort(8080);
- waitingFor(Wait.forListeningPort());
+
waitingFor(Wait.forListeningPort()).withStartupTimeout(Constants.CONTAINER_START_TIMEOUT);
}
}
diff --git
a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/src/test/java/org/kie/kogito/testcontainers/QuarkusKogitoServiceContainer.java
b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/src/test/java/org/kie/kogito/testcontainers/QuarkusKogitoServiceContainer.java
index 13fc6c844..68e546e2a 100644
---
a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/src/test/java/org/kie/kogito/testcontainers/QuarkusKogitoServiceContainer.java
+++
b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/src/test/java/org/kie/kogito/testcontainers/QuarkusKogitoServiceContainer.java
@@ -25,6 +25,6 @@ public class QuarkusKogitoServiceContainer extends
KogitoServiceContainer {
public QuarkusKogitoServiceContainer(String kafkaBootstrapServer, String
kogitoServiceUrl) {
super(kogitoServiceUrl);
addEnv("KAFKA_BOOTSTRAP_SERVERS", kafkaBootstrapServer);
- waitingFor(Wait.forListeningPort());
+
waitingFor(Wait.forListeningPort()).withStartupTimeout(Constants.CONTAINER_START_TIMEOUT);
}
}
diff --git
a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-springboot/src/test/java/org/kie/kogito/testcontainers/SpringBootKogitoServiceContainer.java
b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-springboot/src/test/java/org/kie/kogito/testcontainers/SpringBootKogitoServiceContainer.java
index 624126c78..a302c98a9 100644
---
a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-springboot/src/test/java/org/kie/kogito/testcontainers/SpringBootKogitoServiceContainer.java
+++
b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-springboot/src/test/java/org/kie/kogito/testcontainers/SpringBootKogitoServiceContainer.java
@@ -25,6 +25,6 @@ public class SpringBootKogitoServiceContainer extends
KogitoServiceContainer {
public SpringBootKogitoServiceContainer(String kafkaBootstrapServer,
String kogitoServiceUrl) {
super(kogitoServiceUrl);
addEnv("KOGITO_ADDON_TRACING_DECISION_KAFKA_BOOTSTRAPADDRESS",
kafkaBootstrapServer);
- waitingFor(Wait.forLogMessage(".*Started KogitoApplication in.*", 1));
+ waitingFor(Wait.forLogMessage(".*Started KogitoApplication in.*",
1)).withStartupTimeout(Constants.CONTAINER_START_TIMEOUT);
}
}
diff --git
a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/schema/DDLSchemaExporter.java
b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/schema/DDLSchemaExporter.java
index 9b082ecd2..6022ec688 100644
---
a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/schema/DDLSchemaExporter.java
+++
b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/schema/DDLSchemaExporter.java
@@ -39,6 +39,7 @@ import
org.kie.kogito.index.postgresql.model.ProcessDefinitionEntity;
import org.kie.kogito.index.postgresql.model.ProcessInstanceEntity;
import org.kie.kogito.index.postgresql.model.ProcessInstanceErrorEntity;
import org.kie.kogito.index.postgresql.model.UserTaskInstanceEntity;
+import org.kie.kogito.testcontainers.Constants;
import org.kie.kogito.testcontainers.KogitoPostgreSqlContainer;
import org.testcontainers.containers.wait.strategy.Wait;
@@ -46,7 +47,7 @@ public class DDLSchemaExporter {
public static void main(String[] args) {
try (KogitoPostgreSqlContainer postgresql = new
KogitoPostgreSqlContainer()) {
- postgresql.waitingFor(Wait.forListeningPort());
+
postgresql.waitingFor(Wait.forListeningPort()).withStartupTimeout(Constants.CONTAINER_START_TIMEOUT);
postgresql.start();
Map<String, String> settings = new HashMap<>();
settings.put(Environment.URL, postgresql.getJdbcUrl());
diff --git
a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/containers/AbstractDataIndexContainer.java
b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/containers/AbstractDataIndexContainer.java
index efb814723..dc9a34cc7 100644
---
a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/containers/AbstractDataIndexContainer.java
+++
b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/containers/AbstractDataIndexContainer.java
@@ -26,6 +26,7 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import org.kie.kogito.test.resources.TestResource;
+import org.kie.kogito.testcontainers.Constants;
import org.kie.kogito.testcontainers.KogitoGenericContainer;
import org.testcontainers.containers.BindMode;
import org.testcontainers.containers.wait.strategy.Wait;
@@ -41,7 +42,7 @@ public abstract class AbstractDataIndexContainer extends
KogitoGenericContainer<
public AbstractDataIndexContainer(String containerName) {
super(containerName);
addExposedPort(PORT);
- waitingFor(Wait.forListeningPort());
+
waitingFor(Wait.forListeningPort()).withStartupTimeout(Constants.CONTAINER_START_TIMEOUT);
addEnv("KOGITO_PROTOBUF_FOLDER", "/home/kogito/data/protobufs/");
withAccessToHost(true);
}
diff --git
a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/DataIndexPostgreSqlHttpResource.java
b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/DataIndexPostgreSqlHttpResource.java
index eae92ef59..a0483a101 100644
---
a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/DataIndexPostgreSqlHttpResource.java
+++
b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/DataIndexPostgreSqlHttpResource.java
@@ -20,6 +20,7 @@ package org.kie.kogito.index.test.quarkus.http;
import org.kie.kogito.index.test.containers.DataIndexPostgreSqlContainer;
import org.kie.kogito.test.resources.TestResource;
+import org.kie.kogito.testcontainers.Constants;
import org.kie.kogito.testcontainers.KogitoPostgreSqlContainer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -44,7 +45,7 @@ public class DataIndexPostgreSqlHttpResource implements
TestResource {
Network network = Network.newNetwork();
postgresql.withNetwork(network);
postgresql.withNetworkAliases("postgresql");
- postgresql.waitingFor(Wait.forListeningPort());
+
postgresql.waitingFor(Wait.forListeningPort()).withStartupTimeout(Constants.CONTAINER_START_TIMEOUT);
postgresql.start();
dataIndex.addProtoFileFolder();
diff --git
a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/kafka/DataIndexOracleKafkaResource.java
b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/kafka/DataIndexOracleKafkaResource.java
index 6a589b447..968ad34f5 100644
---
a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/kafka/DataIndexOracleKafkaResource.java
+++
b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/kafka/DataIndexOracleKafkaResource.java
@@ -24,6 +24,7 @@ import java.util.Map;
import org.kie.kogito.index.test.containers.DataIndexOracleContainer;
import org.kie.kogito.index.test.containers.KogitoKafkaContainerWithoutBridge;
import org.kie.kogito.test.resources.TestResource;
+import org.kie.kogito.testcontainers.Constants;
import org.kie.kogito.testcontainers.KogitoOracleSqlContainer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -56,7 +57,7 @@ public class DataIndexOracleKafkaResource implements
TestResource {
oracle.start();
kafka.withNetwork(network);
kafka.withNetworkAliases("kafka");
- kafka.waitingFor(Wait.forListeningPort());
+
kafka.waitingFor(Wait.forListeningPort()).withStartupTimeout(Constants.CONTAINER_START_TIMEOUT);
kafka.start();
String kafkaURL = kafka.getBootstrapServers();
properties.put("kafka.bootstrap.servers", kafkaURL);
diff --git
a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/kafka/DataIndexPostgreSqlKafkaResource.java
b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/kafka/DataIndexPostgreSqlKafkaResource.java
index 760dfda02..cf9caf6d8 100644
---
a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/kafka/DataIndexPostgreSqlKafkaResource.java
+++
b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/kafka/DataIndexPostgreSqlKafkaResource.java
@@ -24,6 +24,7 @@ import java.util.Map;
import org.kie.kogito.index.test.containers.DataIndexPostgreSqlContainer;
import org.kie.kogito.index.test.containers.KogitoKafkaContainerWithoutBridge;
import org.kie.kogito.test.resources.TestResource;
+import org.kie.kogito.testcontainers.Constants;
import org.kie.kogito.testcontainers.KogitoPostgreSqlContainer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -51,11 +52,11 @@ public class DataIndexPostgreSqlKafkaResource implements
TestResource {
Network network = Network.newNetwork();
postgresql.withNetwork(network);
postgresql.withNetworkAliases("postgresql");
- postgresql.waitingFor(Wait.forListeningPort());
+
postgresql.waitingFor(Wait.forListeningPort()).withStartupTimeout(Constants.CONTAINER_START_TIMEOUT);
postgresql.start();
kafka.withNetwork(network);
kafka.withNetworkAliases("kafka");
- kafka.waitingFor(Wait.forListeningPort());
+
kafka.waitingFor(Wait.forListeningPort()).withStartupTimeout(Constants.CONTAINER_START_TIMEOUT);
kafka.start();
String kafkaURL = kafka.getBootstrapServers();
properties.put("kafka.bootstrap.servers", kafkaURL);
diff --git
a/persistence-commons/persistence-commons-oracle/src/test/java/org/kie/kogito/persistence/schema/DDLSchemaExporter.java
b/persistence-commons/persistence-commons-oracle/src/test/java/org/kie/kogito/persistence/schema/DDLSchemaExporter.java
index 9269c56b9..ca2b0d05e 100644
---
a/persistence-commons/persistence-commons-oracle/src/test/java/org/kie/kogito/persistence/schema/DDLSchemaExporter.java
+++
b/persistence-commons/persistence-commons-oracle/src/test/java/org/kie/kogito/persistence/schema/DDLSchemaExporter.java
@@ -30,6 +30,7 @@ import org.hibernate.cfg.Environment;
import org.hibernate.tool.hbm2ddl.SchemaExport;
import org.hibernate.tool.schema.TargetType;
import org.kie.kogito.persistence.oracle.model.CacheEntity;
+import org.kie.kogito.testcontainers.Constants;
import org.kie.kogito.testcontainers.KogitoOracleSqlContainer;
import org.testcontainers.containers.wait.strategy.Wait;
@@ -37,7 +38,7 @@ public class DDLSchemaExporter {
public static void main(String[] args) {
try (KogitoOracleSqlContainer oracle = new KogitoOracleSqlContainer())
{
- oracle.waitingFor(Wait.forListeningPort());
+
oracle.waitingFor(Wait.forListeningPort()).withStartupTimeout(Constants.CONTAINER_START_TIMEOUT);
oracle.start();
Map<String, String> settings = new HashMap<>();
settings.put(Environment.URL, oracle.getJdbcUrl());
diff --git
a/persistence-commons/persistence-commons-postgresql/src/test/java/org/kie/kogito/persistence/schema/DDLSchemaExporter.java
b/persistence-commons/persistence-commons-postgresql/src/test/java/org/kie/kogito/persistence/schema/DDLSchemaExporter.java
index 2d8e5734f..17e883c8a 100644
---
a/persistence-commons/persistence-commons-postgresql/src/test/java/org/kie/kogito/persistence/schema/DDLSchemaExporter.java
+++
b/persistence-commons/persistence-commons-postgresql/src/test/java/org/kie/kogito/persistence/schema/DDLSchemaExporter.java
@@ -30,6 +30,7 @@ import org.hibernate.cfg.Environment;
import org.hibernate.tool.hbm2ddl.SchemaExport;
import org.hibernate.tool.schema.TargetType;
import org.kie.kogito.persistence.postgresql.model.CacheEntity;
+import org.kie.kogito.testcontainers.Constants;
import org.kie.kogito.testcontainers.KogitoPostgreSqlContainer;
import org.testcontainers.containers.wait.strategy.Wait;
@@ -37,7 +38,7 @@ public class DDLSchemaExporter {
public static void main(String[] args) {
try (KogitoPostgreSqlContainer postgresql = new
KogitoPostgreSqlContainer()) {
- postgresql.waitingFor(Wait.forListeningPort());
+
postgresql.waitingFor(Wait.forListeningPort()).withStartupTimeout(Constants.CONTAINER_START_TIMEOUT);
postgresql.start();
Map<String, String> settings = new HashMap<>();
settings.put(Environment.URL, postgresql.getJdbcUrl());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
