Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,8 @@

package io.opentelemetry.javaagent.instrumentation.couchbase.v3_1;

import static org.awaitility.Awaitility.await;

import com.couchbase.client.core.env.TimeoutConfig;
import com.couchbase.client.core.error.DocumentNotFoundException;
import com.couchbase.client.core.error.UnambiguousTimeoutException;
import com.couchbase.client.java.Bucket;
import com.couchbase.client.java.Cluster;
import com.couchbase.client.java.ClusterOptions;
Expand Down Expand Up @@ -44,20 +41,8 @@ class CouchbaseClient31Test {

@BeforeAll
static void setup() {
// wait and retry in the hope that it will help against test flakiness
await()
.atMost(Duration.ofMinutes(5))
.ignoreException(UnambiguousTimeoutException.class)
.until(
() -> {
startCouchbase();
return true;
});
}

private static void startCouchbase() {
couchbase =
new CouchbaseContainer("couchbase/server:7.6.0")
new CouchbaseContainer("couchbase/server:6.5.1")
.withExposedPorts(8091)
.withEnabledServices(CouchbaseService.KV)
.withBucket(new BucketDefinition("test"))
Expand Down
Loading