doh - server ready, search index server still down.

Author: christophstrobl

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/VectorIndexIntegrationTests.java

@@ -51,6 +51,7 @@
  */
 @ExtendWith(MongoServerCondition.class)
 @Testcontainers(disabledWithoutDocker = true)
+@Tag("collection:movie")
 class VectorIndexIntegrationTests {
 
 	private static final @Container AtlasContainer atlasLocal = AtlasContainer.bestMatch();

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoServerCondition.java

@@ -15,6 +15,9 @@
  */
 package org.springframework.data.mongodb.test.util;
 
+import java.time.Duration;
+import java.util.Optional;
+
 import org.junit.jupiter.api.extension.ConditionEvaluationResult;
 import org.junit.jupiter.api.extension.ExecutionCondition;
 import org.junit.jupiter.api.extension.ExtensionContext;
@@ -23,6 +26,7 @@
 import org.springframework.data.util.Version;
 import org.springframework.util.NumberUtils;
 import org.springframework.util.StringUtils;
+import org.testcontainers.shaded.org.awaitility.Awaitility;
 
 import com.mongodb.client.MongoClient;
 
@@ -103,7 +107,24 @@ private boolean atlasEnvironment(ExtensionContext context) {
 
 			if (StringUtils.hasText(host) && StringUtils.hasText(port)) {
 				try (MongoClient client = MongoTestUtils.client(host, NumberUtils.parseNumber(port, Integer.class))) {
-					return MongoTestUtils.isVectorSearchEnabled(client);
+					if (!MongoTestUtils.isVectorSearchEnabled(client)) {
+						return false;
+					}
+
+					Optional<String> collectionTag = context.getTags().stream().filter(tag -> tag.startsWith("collection"))
+							.findFirst();
+					if (collectionTag.isPresent()) {
+
+						String collectionName = collectionTag.get().split(":")[1];
+						try {
+							Awaitility.await().atMost(Duration.ofSeconds(60)).pollInterval(Duration.ofMillis(200)).until(() -> {
+								return MongoTestUtils.isSearchIndexReady(client, null, collectionName);
+							});
+						} catch (Exception e) {
+							return false;
+						}
+					}
+					return true;
 				}
 			}
 			return MongoTestUtils.isVectorSearchEnabled();

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoTestUtils.java

@@ -15,6 +15,8 @@
  */
 package org.springframework.data.mongodb.test.util;
 
+import org.jspecify.annotations.Nullable;
+import org.springframework.util.StringUtils;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 import reactor.util.retry.Retry;
@@ -289,6 +291,18 @@ public static boolean isVectorSearchEnabled(MongoClient client) {
 		}
 	}
 
+	public static boolean isSearchIndexReady(MongoClient client, @Nullable String database, String collectionName) {
+
+		try {
+			MongoCollection<Document> collection = client.getDatabase(StringUtils.hasText(database) ? database : "test").getCollection(collectionName);
+			collection.aggregate(List.of(new Document("$listSearchIndexes", new Document())));
+		} catch (Exception e) {
+			return false;
+		}
+		return true;
+
+	}
+
 	public static Duration getTimeout() {
 
 		return ObjectUtils.nullSafeEquals("jenkins", ENV.getProperty("user.name")) ? Duration.ofMillis(100)