Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix TeamCity errors for 5.26 #4310

Merged
merged 3 commits into from
Dec 17, 2024
Merged

Fix TeamCity errors for 5.26 #4310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
23a6204
Fix TeamCity errors for 5.26
vga91 Dec 17, 2024
af82357
added waitOptions
vga91 Dec 17, 2024
a418e3e
restored withBucket instead of manual bucket creation
vga91 Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions extended-it/src/test/java/apoc/couchbase/CouchbaseTestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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),
Expand All @@ -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")
Expand Down Expand Up @@ -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));
Expand Down
2 changes: 1 addition & 1 deletion extended-it/src/test/java/apoc/vectordb/WeaviateTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
Loading