Fix TeamCity errors for 5.26 (#4310)

* Fix TeamCity errors for 5.26 * added waitOptions * restored withBucket instead of manual bucket creation
neo4j-contrib · Dec 17, 2024 · ab0ed5e · ab0ed5e
1 parent ee53a1a
commit ab0ed5e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/extended-it/src/test/java/apoc/couchbase/CouchbaseTestUtils.java b/extended-it/src/test/java/apoc/couchbase/CouchbaseTestUtils.java
@@ -3,13 +3,16 @@
 import apoc.couchbase.document.CouchbaseJsonDocument;
 import com.couchbase.client.core.env.SeedNode;
 import com.couchbase.client.core.io.CollectionIdentifier;
+import com.couchbase.client.core.service.ServiceType;
 import com.couchbase.client.java.Bucket;
 import com.couchbase.client.java.Cluster;
 import com.couchbase.client.java.ClusterOptions;
 import com.couchbase.client.java.Collection;
+import com.couchbase.client.java.diagnostics.WaitUntilReadyOptions;
 import com.couchbase.client.java.json.JsonArray;
 import com.couchbase.client.java.json.JsonObject;
 import com.couchbase.client.java.env.ClusterEnvironment;
+import com.couchbase.client.java.manager.bucket.BucketSettings;
 import com.couchbase.client.java.manager.collection.CollectionManager;
 import com.couchbase.client.java.manager.collection.CollectionSpec;
 import com.couchbase.client.java.query.QueryResult;
@@ -65,7 +68,9 @@ public class CouchbaseTestUtils {
 
     public static boolean fillDB(Cluster cluster) {
         Bucket couchbaseBucket = cluster.bucket(BUCKET_NAME);
-        couchbaseBucket.waitUntilReady(Duration.ofMinutes(1));
+        WaitUntilReadyOptions waitOptions = WaitUntilReadyOptions.waitUntilReadyOptions()
+                .serviceTypes(ServiceType.QUERY);
+        couchbaseBucket.waitUntilReady(Duration.ofMinutes(5), waitOptions);
         Collection collection = couchbaseBucket.defaultCollection();
         collection.insert("artist:vincent_van_gogh", VINCENT_VAN_GOGH);
         QueryResult queryResult = cluster.query(String.format(QUERY, BUCKET_NAME),
@@ -85,7 +90,7 @@ public static boolean fillDB(Cluster cluster) {
     }
 
     public static String getUrl(CouchbaseContainer couchbaseContainer) {
-        return String.format("couchbase://%s:%s@%s:%s", USERNAME, PASSWORD, couchbaseContainer.getContainerIpAddress(), couchbaseContainer.getMappedPort(8091));
+        return String.format("couchbase://%s:%s@%s:%s", USERNAME, PASSWORD, couchbaseContainer.getHost(), couchbaseContainer.getMappedPort(8091));
     }
 
     @SuppressWarnings("unchecked")
@@ -135,7 +140,7 @@ protected static void checkDocumentMetadata(CouchbaseJsonDocument jsonDocumentCr
 
     protected static void createCouchbaseContainer() {
         // 7.x support stably multi collections and scopes
-        couchbase = new CouchbaseContainer("couchbase/server:7.2.6")
+        couchbase = new CouchbaseContainer("couchbase/server:7.6.4")
                 .withStartupAttempts(3)
                 .withCredentials(USERNAME, PASSWORD)
                 .withBucket(new BucketDefinition(BUCKET_NAME));

diff --git a/extended-it/src/test/java/apoc/vectordb/WeaviateTest.java b/extended-it/src/test/java/apoc/vectordb/WeaviateTest.java
@@ -561,7 +561,7 @@ private static void assertQueryVectorsWithSystemDbStorage(String keyConfig, Stri
                     db,
                     query,
                     params,
-                    "Caused by: java.io.FileNotFoundException: http://127.0.0.1:" + HOST.split(":")[1] + "/v3/graphql"
+                    "Caused by: java.io.FileNotFoundException"
             );
             return;
         }
-Original file line number
+Diff line change
@@ Expand Up @@
                         db,
                         query,
                         params,
-                        "Caused by: java.io.FileNotFoundException: http://127.0.0.1:" + HOST.split(":")[1] + "/v3/graphql"
+                        "Caused by: java.io.FileNotFoundException"
                 );
                 return;
             }
@@ Expand Down @@