root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Attempt to work around couchbase CI failures

This commit is contained in:
Phillip Webb 2016-03-23 23:29:42 -07:00
parent 88f3fa4f78
commit 4167469781
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/AbstractCouchbaseAutoConfigurationTests.java
View File

@ -19,7 +19,7 @@ package org.springframework.boot.autoconfigure.couchbase;
import org.junit.After;
import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
import org.springframework.boot.test.EnvironmentTestUtils;
import org.springframework.boot.test.util.EnvironmentTestUtils;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
/**

12
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseTestServer.java
View File

@ -30,6 +30,8 @@ import org.junit.rules.TestRule;
import org.junit.runner.Description;
import org.junit.runners.model.Statement;
import org.springframework.beans.factory.BeanCreationException;
/**
* {@link TestRule} for working with an optional Couchbase server. Expects a default
* {@link Bucket} with no password to be available on localhost.
@ -48,8 +50,7 @@ public class CouchbaseTestServer implements TestRule {
public Statement apply(Statement base, Description description) {
try {
this.environment = DefaultCouchbaseEnvironment.create();
this.cluster = CouchbaseCluster.create(this.environment,
"localhost");
this.cluster = CouchbaseCluster.create(this.environment, "localhost");
testConnection(this.cluster);
return new CouchbaseStatement(base, this.environment, this.cluster);
}
@ -98,6 +99,13 @@ public class CouchbaseTestServer implements TestRule {
try {
this.base.evaluate();
}
catch (BeanCreationException ex) {
if ("couchbaseClient".equals(ex.getBeanName())) {
throw new AssumptionViolatedException(
"Skipping test due to Couchbase error " + ex.getMessage(),
ex);
}
}
finally {
try {
this.cluster.disconnect();