From a37c170376156f1cd94e6c15d0d253201ca7a491 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 30 Jan 2020 14:59:10 +0000 Subject: [PATCH] Try to make CouchbaseAutoConfigurationIntegrationTests less flakey Closes gh-19932 --- ...chbaseAutoConfigurationIntegrationTests.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationIntegrationTests.java index edab8bab1c5..b9ec3da79bd 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationIntegrationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationIntegrationTests.java @@ -17,15 +17,21 @@ package org.springframework.boot.autoconfigure.couchbase; import java.time.Duration; +import java.util.Collections; +import java.util.List; import com.couchbase.client.java.Bucket; import com.couchbase.client.java.Cluster; import com.couchbase.client.java.CouchbaseBucket; import com.couchbase.client.java.bucket.BucketType; +import com.couchbase.client.java.cluster.BucketSettings; import com.couchbase.client.java.cluster.ClusterInfo; import com.couchbase.client.java.cluster.DefaultBucketSettings; +import com.couchbase.client.java.cluster.UserRole; +import com.couchbase.client.java.cluster.UserSettings; import com.couchbase.client.java.env.CouchbaseEnvironment; import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.testcontainers.couchbase.CouchbaseContainer; @@ -51,12 +57,19 @@ class CouchbaseAutoConfigurationIntegrationTests { @Container static final CouchbaseContainer couchbase = new CouchbaseContainer().withClusterAdmin("spring", "password") - .withNewBucket(DefaultBucketSettings.builder().enableFlush(true).name("default").password("secret") - .quota(100).replicas(0).type(BucketType.COUCHBASE).build()) .withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(10)); private AnnotationConfigApplicationContext context; + @BeforeAll + static void createBucket() { + BucketSettings bucketSettings = DefaultBucketSettings.builder().enableFlush(true).name("default") + .password("password").quota(100).replicas(0).type(BucketType.COUCHBASE).build(); + List userSettings = Collections.singletonList(new UserRole("admin")); + couchbase.createBucket(bucketSettings, + UserSettings.build().password(bucketSettings.password()).roles(userSettings), true); + } + @BeforeEach void setUp() { this.context = new AnnotationConfigApplicationContext();