Spring/spring-data-couchbase
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATACOUCH-479 - Fix issue with testcontainers usage.

Browse Source 
After updating the POM to not have a fixed testcontainers version, we
discovered the tests were failing with later versions of testcontainers.  It
seems that they updated how they did WaitStrategy, deprecating the old way, so
our WaitStrategy was not being called.  That means no setup was done to
the cluster (passwords, buckets, etc...).  Simple fix was to move to the
new interface.
This commit is contained in:
David Kelly
2019-10-31 14:22:01 -06:00
parent a2c143798d
commit 4a8e07f8fd
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/test/java/org/springframework/data/couchbase/CouchbaseWaitStrategy.java
View File

@@ -7,11 +7,11 @@ import java.util.concurrent.Callable;
import java.util.concurrent.TimeUnit;
import com.couchbase.client.java.util.features.Version;
import org.rnorth.ducttape.ratelimits.RateLimiterBuilder;
import org.rnorth.ducttape.unreliables.Unreliables;
import org.testcontainers.containers.Container;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.wait.WaitStrategy;
import org.testcontainers.containers.wait.strategy.WaitStrategy;
import org.testcontainers.containers.wait.strategy.WaitStrategyTarget;
/**
* WaitStrategy for Couchbase containers which makes the Server node is
@@ -21,8 +21,10 @@ public class CouchbaseWaitStrategy implements WaitStrategy {
private Duration startupTimeout = Duration.of(60, SECONDS);
private final Boolean rbacEnabled;
private final Container container;
public CouchbaseWaitStrategy(String serverVersion) {
public CouchbaseWaitStrategy(String serverVersion, GenericContainer container) {
this.container = container;
Version version = Version.parseVersion(serverVersion);
rbacEnabled = version.major() >= 5;
}
@@ -40,11 +42,10 @@ public class CouchbaseWaitStrategy implements WaitStrategy {
}
@Override
public void waitUntilReady(GenericContainer container) {
public void waitUntilReady(WaitStrategyTarget target) {
try {
checkService(8091, "/pools");
Container.ExecResult result;
if (rbacEnabled) {
result = container.execInContainer("/opt/couchbase/bin/couchbase-cli",
"cluster-init",

2
src/test/java/org/springframework/data/couchbase/TestContainerResource.java
View File

@@ -44,7 +44,7 @@ public class TestContainerResource extends ExternalResource {
.withFixedExposedPort(11210, 11210)
.withFixedExposedPort(11211, 11211)
.withFixedExposedPort(11207, 11207);
couchbaseContainer.waitingFor(new CouchbaseWaitStrategy(serverVersion));
couchbaseContainer.waitingFor(new CouchbaseWaitStrategy(serverVersion, couchbaseContainer));
couchbaseContainer.start();
}