Merge pull request #45160 from gsmet/test-mongodb-70

Update version of MongoDB used for testing to 7.0
quarkusio · Dec 28, 2024 · df371c2 · df371c2
2 parents 283659c + 01060f2
commit df371c2
Show file tree

Hide file tree

Showing 12 changed files with 47 additions and 8 deletions.
diff --git a/...ent/deployment/src/test/java/io/quarkus/mongodb/DefaultAndNamedMongoClientConfigTest.java b/...ent/deployment/src/test/java/io/quarkus/mongodb/DefaultAndNamedMongoClientConfigTest.java
@@ -11,6 +11,8 @@
 import org.eclipse.microprofile.health.HealthCheckResponse;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import com.mongodb.client.MongoClient;
@@ -21,6 +23,7 @@
 import io.quarkus.mongodb.health.MongoHealthCheck;
 import io.quarkus.test.QuarkusUnitTest;
 
+@DisabledOnOs(value = OS.WINDOWS, disabledReason = "Flapdoodle doesn't work very well on Windows with replicas")
 public class DefaultAndNamedMongoClientConfigTest extends MongoWithReplicasTestBase {
 
     @RegisterExtension

diff --git a/...godb-client/deployment/src/test/java/io/quarkus/mongodb/DefaultMongoClientConfigTest.java b/...godb-client/deployment/src/test/java/io/quarkus/mongodb/DefaultMongoClientConfigTest.java
@@ -11,6 +11,8 @@
 import org.eclipse.microprofile.health.HealthCheckResponse;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import com.mongodb.client.MongoClient;
@@ -19,6 +21,7 @@
 import io.quarkus.mongodb.reactive.ReactiveMongoClient;
 import io.quarkus.test.QuarkusUnitTest;
 
+@DisabledOnOs(value = OS.WINDOWS, disabledReason = "Flapdoodle doesn't work very well on Windows with replicas")
 public class DefaultMongoClientConfigTest extends MongoWithReplicasTestBase {
 
     @RegisterExtension

diff --git a/...ons/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoClientConfigTest.java b/...ons/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoClientConfigTest.java
@@ -8,6 +8,8 @@
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import com.mongodb.ReadConcern;
@@ -21,6 +23,7 @@
 import io.quarkus.mongodb.reactive.ReactiveMongoClient;
 import io.quarkus.test.QuarkusUnitTest;
 
+@DisabledOnOs(value = OS.WINDOWS, disabledReason = "Flapdoodle doesn't work very well on Windows with replicas")
 public class MongoClientConfigTest extends MongoWithReplicasTestBase {
 
     @RegisterExtension

diff --git a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoTestBase.java b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoTestBase.java
@@ -11,6 +11,7 @@
 import de.flapdoodle.embed.mongo.distribution.Version;
 import de.flapdoodle.embed.mongo.transitions.Mongod;
 import de.flapdoodle.embed.mongo.transitions.RunningMongodProcess;
+import de.flapdoodle.embed.process.types.ProcessConfig;
 import de.flapdoodle.reverse.TransitionWalker;
 import de.flapdoodle.reverse.transitions.Start;
 
@@ -42,7 +43,7 @@ public static void startMongoDatabase() throws IOException {
         String uri = getConfiguredConnectionString();
         // This switch allow testing against a running mongo database.
         if (uri == null) {
-            Version.Main version = Version.Main.V4_4;
+            Version.Main version = Version.Main.V7_0;
             int port = 27018;
             LOGGER.infof("Starting Mongo %s on port %s", version, port);
 
@@ -53,6 +54,9 @@ public static void startMongoDatabase() throws IOException {
                             .build()))
                     .withMongodArguments(Start.to(MongodArguments.class)
                             .initializedWith(MongodArguments.defaults().withUseNoJournal(false)))
+                    .withProcessConfig(
+                            Start.to(ProcessConfig.class)
+                                    .initializedWith(ProcessConfig.defaults().withStopTimeoutInMillis(15_000)))
                     .start(version);
 
         } else {

diff --git a/...mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoWithReplicasTestBase.java b/...mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoWithReplicasTestBase.java
@@ -1,7 +1,6 @@
 package io.quarkus.mongodb;
 
 import static io.quarkus.mongodb.MongoTestBase.getConfiguredConnectionString;
-import static org.awaitility.Awaitility.await;
 import static org.awaitility.Durations.ONE_MINUTE;
 import static org.awaitility.Durations.ONE_SECOND;
 
@@ -32,6 +31,7 @@
 import de.flapdoodle.embed.mongo.transitions.Mongod;
 import de.flapdoodle.embed.mongo.transitions.RunningMongodProcess;
 import de.flapdoodle.embed.process.io.ProcessOutput;
+import de.flapdoodle.embed.process.types.ProcessConfig;
 import de.flapdoodle.reverse.TransitionWalker;
 import de.flapdoodle.reverse.transitions.Start;
 
@@ -47,7 +47,7 @@ public static void startMongoDatabase() {
 
         // This switch allow testing against a running mongo database.
         if (uri == null) {
-            startedServers = startReplicaSet(Version.Main.V4_4, 27018, "test001");
+            startedServers = startReplicaSet(Version.Main.V7_0, 27018, "test001");
         } else {
             LOGGER.infof("Using existing Mongo %s", uri);
         }
@@ -93,7 +93,10 @@ private static Mongod mongodWithPort(int port, String replicaSet) {
                 .withProcessOutput(Start.to(ProcessOutput.class).initializedWith(ProcessOutput.silent()))
                 .withMongodArguments(Start.to(MongodArguments.class).initializedWith(
                         MongodArguments.defaults().withArgs(Map.of("--replSet", replicaSet)).withSyncDelay(10)
-                                .withUseSmallFiles(true).withUseNoJournal(false)));
+                                .withUseSmallFiles(true).withUseNoJournal(false)))
+                .withProcessConfig(
+                        Start.to(ProcessConfig.class)
+                                .initializedWith(ProcessConfig.defaults().withStopTimeoutInMillis(15_000)));
     }
 
     @AfterAll

diff --git a/...ongodb-client/deployment/src/test/java/io/quarkus/mongodb/NamedMongoClientConfigTest.java b/...ongodb-client/deployment/src/test/java/io/quarkus/mongodb/NamedMongoClientConfigTest.java
@@ -13,6 +13,8 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import com.mongodb.client.MongoClient;
@@ -23,6 +25,7 @@
 import io.quarkus.mongodb.health.MongoHealthCheck;
 import io.quarkus.test.QuarkusUnitTest;
 
+@DisabledOnOs(value = OS.WINDOWS, disabledReason = "Flapdoodle doesn't work very well on Windows with replicas")
 public class NamedMongoClientConfigTest extends MongoWithReplicasTestBase {
     @RegisterExtension
     static final QuarkusUnitTest config = new QuarkusUnitTest()

diff --git a/...lient/deployment/src/test/java/io/quarkus/mongodb/NamedReactiveMongoClientConfigTest.java b/...lient/deployment/src/test/java/io/quarkus/mongodb/NamedReactiveMongoClientConfigTest.java
@@ -14,6 +14,8 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import com.mongodb.reactivestreams.client.MongoClient;
@@ -28,6 +30,7 @@
 import io.quarkus.mongodb.reactive.ReactiveMongoClient;
 import io.quarkus.test.QuarkusUnitTest;
 
+@DisabledOnOs(value = OS.WINDOWS, disabledReason = "Flapdoodle doesn't work very well on Windows with replicas")
 public class NamedReactiveMongoClientConfigTest extends MongoWithReplicasTestBase {
 
     @RegisterExtension

diff --git a/...-client/runtime/src/test/java/io/quarkus/mongodb/reactive/ConnectionToReplicaSetTest.java b/...-client/runtime/src/test/java/io/quarkus/mongodb/reactive/ConnectionToReplicaSetTest.java
@@ -10,13 +10,16 @@
 import org.bson.Document;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
 
 import com.mongodb.client.model.changestream.FullDocument;
 import com.mongodb.reactivestreams.client.MongoClients;
 
 import io.quarkus.mongodb.ChangeStreamOptions;
 import io.quarkus.mongodb.impl.ReactiveMongoClientImpl;
 
+@DisabledOnOs(value = OS.WINDOWS, disabledReason = "Flapdoodle doesn't work very well on Windows with replicas")
 class ConnectionToReplicaSetTest extends MongoWithReplicasTestBase {
 
     private ReactiveMongoClient client;

diff --git a/...ns/mongodb-client/runtime/src/test/java/io/quarkus/mongodb/reactive/ListDatabaseTest.java b/...ns/mongodb-client/runtime/src/test/java/io/quarkus/mongodb/reactive/ListDatabaseTest.java
@@ -8,13 +8,16 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
 
 import com.mongodb.ClientSessionOptions;
 import com.mongodb.reactivestreams.client.ClientSession;
 import com.mongodb.reactivestreams.client.MongoClients;
 
 import io.quarkus.mongodb.impl.ReactiveMongoClientImpl;
 
+@DisabledOnOs(value = OS.WINDOWS, disabledReason = "Flapdoodle doesn't work very well on Windows with replicas")
 class ListDatabaseTest extends MongoWithReplicasTestBase {
 
     private ReactiveMongoClient client;

diff --git a/...sions/mongodb-client/runtime/src/test/java/io/quarkus/mongodb/reactive/MongoTestBase.java b/...sions/mongodb-client/runtime/src/test/java/io/quarkus/mongodb/reactive/MongoTestBase.java
@@ -21,6 +21,7 @@
 import de.flapdoodle.embed.mongo.distribution.Version;
 import de.flapdoodle.embed.mongo.transitions.Mongod;
 import de.flapdoodle.embed.mongo.transitions.RunningMongodProcess;
+import de.flapdoodle.embed.process.types.ProcessConfig;
 import de.flapdoodle.reverse.TransitionWalker;
 import de.flapdoodle.reverse.transitions.Start;
 import io.smallrye.mutiny.Uni;
@@ -55,7 +56,7 @@ public static void startMongoDatabase() throws IOException {
         String uri = getConfiguredConnectionString();
         // This switch allow testing against a running mongo database.
         if (uri == null) {
-            Version.Main version = Version.Main.V4_4;
+            Version.Main version = Version.Main.V7_0;
             int port = 27018;
             LOGGER.infof("Starting Mongo %s on port %s", version, port);
 
@@ -66,6 +67,9 @@ public static void startMongoDatabase() throws IOException {
                             .build()))
                     .withMongodArguments(Start.to(MongodArguments.class)
                             .initializedWith(MongodArguments.defaults().withUseNoJournal(false)))
+                    .withProcessConfig(
+                            Start.to(ProcessConfig.class)
+                                    .initializedWith(ProcessConfig.defaults().withStopTimeoutInMillis(15_000)))
                     .start(version);
 
         } else {

diff --git a/...b-client/runtime/src/test/java/io/quarkus/mongodb/reactive/MongoWithReplicasTestBase.java b/...b-client/runtime/src/test/java/io/quarkus/mongodb/reactive/MongoWithReplicasTestBase.java
@@ -31,6 +31,7 @@
 import de.flapdoodle.embed.mongo.transitions.Mongod;
 import de.flapdoodle.embed.mongo.transitions.RunningMongodProcess;
 import de.flapdoodle.embed.process.io.ProcessOutput;
+import de.flapdoodle.embed.process.types.ProcessConfig;
 import de.flapdoodle.reverse.TransitionWalker;
 import de.flapdoodle.reverse.transitions.Start;
 
@@ -46,7 +47,7 @@ public static void startMongoDatabase() {
 
         // This switch allow testing against a running mongo database.
         if (uri == null) {
-            startedServers = startReplicaSet(Version.Main.V4_4, 27018, "test001");
+            startedServers = startReplicaSet(Version.Main.V7_0, 27018, "test001");
         } else {
             LOGGER.infof("Using existing Mongo %s", uri);
         }
@@ -92,7 +93,10 @@ private static Mongod mongodWithPort(int port, String replicaSet) {
                 .withProcessOutput(Start.to(ProcessOutput.class).initializedWith(ProcessOutput.silent()))
                 .withMongodArguments(Start.to(MongodArguments.class).initializedWith(
                         MongodArguments.defaults().withArgs(Map.of("--replSet", replicaSet)).withSyncDelay(10)
-                                .withUseSmallFiles(true).withUseNoJournal(false)));
+                                .withUseSmallFiles(true).withUseNoJournal(false)))
+                .withProcessConfig(
+                        Start.to(ProcessConfig.class)
+                                .initializedWith(ProcessConfig.defaults().withStopTimeoutInMillis(15_000)));
     }
 
     @AfterAll

diff --git a/test-framework/mongodb/src/main/java/io/quarkus/test/mongodb/MongoTestResource.java b/test-framework/mongodb/src/main/java/io/quarkus/test/mongodb/MongoTestResource.java
@@ -13,6 +13,7 @@
 import de.flapdoodle.embed.mongo.distribution.Versions;
 import de.flapdoodle.embed.mongo.transitions.Mongod;
 import de.flapdoodle.embed.mongo.transitions.RunningMongodProcess;
+import de.flapdoodle.embed.process.types.ProcessConfig;
 import de.flapdoodle.reverse.TransitionWalker;
 import de.flapdoodle.reverse.transitions.Start;
 import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
@@ -39,7 +40,7 @@ public static IFeatureAwareVersion version(Map<String, String> initArgs) {
         return versionArg.<IFeatureAwareVersion> map(Version.Main::valueOf)
                 .orElseGet(() -> versionArg.map(
                         versionStr -> Versions.withFeatures(de.flapdoodle.embed.process.distribution.Version.of(versionStr)))
-                        .orElse(Version.Main.V4_4));
+                        .orElse(Version.Main.V7_0));
     }
 
     public static void forceExtendedSocketOptionsClassInit() {
@@ -68,6 +69,8 @@ public Map<String, String> start() {
                 .initializedWith(Net.builder().from(Net.defaults()).port(port).build()))
                 .withMongodArguments(Start.to(MongodArguments.class)
                         .initializedWith(MongodArguments.defaults().withUseNoJournal(false)))
+                .withProcessConfig(
+                        Start.to(ProcessConfig.class).initializedWith(ProcessConfig.defaults().withStopTimeoutInMillis(15_000)))
                 .start(version);
 
         return Collections.singletonMap("quarkus.mongodb.hosts", String.format("127.0.0.1:%d", port));