Skip to content

Commit 9f109fe

Browse files
committed
Disable Couchbase integration tests on aarch64 linux and mac
See gh-35228
1 parent c768307 commit 9f109fe

File tree

4 files changed

+16
-0
lines changed

4 files changed

+16
-0
lines changed

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationIntegrationTests.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,15 @@
2727
import com.couchbase.client.java.json.JsonObject;
2828
import com.fasterxml.jackson.databind.ObjectMapper;
2929
import org.junit.jupiter.api.Test;
30+
import org.junit.jupiter.api.condition.OS;
3031
import org.testcontainers.couchbase.BucketDefinition;
3132
import org.testcontainers.couchbase.CouchbaseContainer;
3233
import org.testcontainers.junit.jupiter.Container;
3334
import org.testcontainers.junit.jupiter.Testcontainers;
3435

3536
import org.springframework.boot.autoconfigure.AutoConfigurations;
3637
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
38+
import org.springframework.boot.testsupport.junit.DisabledOnOs;
3739
import org.springframework.boot.testsupport.testcontainers.DockerImageNames;
3840

3941
import static org.assertj.core.api.Assertions.assertThat;
@@ -44,6 +46,8 @@
4446
* @author Stephane Nicoll
4547
* @author Brian Clozel
4648
*/
49+
@DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64",
50+
disabledReason = "The Couchbase image has no ARM support")
4751
@Testcontainers(disabledWithoutDocker = true)
4852
class CouchbaseAutoConfigurationIntegrationTests {
4953

spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/couchbase/DataCouchbaseTestIntegrationTests.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,15 @@
1919
import java.time.Duration;
2020

2121
import org.junit.jupiter.api.Test;
22+
import org.junit.jupiter.api.condition.OS;
2223
import org.testcontainers.couchbase.BucketDefinition;
2324
import org.testcontainers.couchbase.CouchbaseContainer;
2425
import org.testcontainers.junit.jupiter.Container;
2526
import org.testcontainers.junit.jupiter.Testcontainers;
2627

2728
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
2829
import org.springframework.beans.factory.annotation.Autowired;
30+
import org.springframework.boot.testsupport.junit.DisabledOnOs;
2931
import org.springframework.boot.testsupport.testcontainers.DockerImageNames;
3032
import org.springframework.context.ApplicationContext;
3133
import org.springframework.data.couchbase.core.CouchbaseTemplate;
@@ -42,6 +44,8 @@
4244
*/
4345
@DataCouchbaseTest
4446
@Testcontainers(disabledWithoutDocker = true)
47+
@DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64",
48+
disabledReason = "The Couchbase image has no ARM support")
4549
class DataCouchbaseTestIntegrationTests {
4650

4751
private static final String BUCKET_NAME = "cbbucket";

spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/couchbase/DataCouchbaseTestReactiveIntegrationTests.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,14 @@
1919
import java.time.Duration;
2020

2121
import org.junit.jupiter.api.Test;
22+
import org.junit.jupiter.api.condition.OS;
2223
import org.testcontainers.couchbase.BucketDefinition;
2324
import org.testcontainers.couchbase.CouchbaseContainer;
2425
import org.testcontainers.junit.jupiter.Container;
2526
import org.testcontainers.junit.jupiter.Testcontainers;
2627

2728
import org.springframework.beans.factory.annotation.Autowired;
29+
import org.springframework.boot.testsupport.junit.DisabledOnOs;
2830
import org.springframework.boot.testsupport.testcontainers.DockerImageNames;
2931
import org.springframework.data.couchbase.core.ReactiveCouchbaseTemplate;
3032
import org.springframework.test.context.DynamicPropertyRegistry;
@@ -40,6 +42,8 @@
4042
*/
4143
@DataCouchbaseTest
4244
@Testcontainers(disabledWithoutDocker = true)
45+
@DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64",
46+
disabledReason = "The Couchbase image has no ARM support")
4347
class DataCouchbaseTestReactiveIntegrationTests {
4448

4549
private static final String BUCKET_NAME = "cbbucket";

spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/couchbase/DataCouchbaseTestWithIncludeFilterIntegrationTests.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,14 @@
1919
import java.time.Duration;
2020

2121
import org.junit.jupiter.api.Test;
22+
import org.junit.jupiter.api.condition.OS;
2223
import org.testcontainers.couchbase.BucketDefinition;
2324
import org.testcontainers.couchbase.CouchbaseContainer;
2425
import org.testcontainers.junit.jupiter.Container;
2526
import org.testcontainers.junit.jupiter.Testcontainers;
2627

2728
import org.springframework.beans.factory.annotation.Autowired;
29+
import org.springframework.boot.testsupport.junit.DisabledOnOs;
2830
import org.springframework.boot.testsupport.testcontainers.DockerImageNames;
2931
import org.springframework.context.annotation.ComponentScan.Filter;
3032
import org.springframework.stereotype.Service;
@@ -41,6 +43,8 @@
4143
*/
4244
@DataCouchbaseTest(includeFilters = @Filter(Service.class))
4345
@Testcontainers(disabledWithoutDocker = true)
46+
@DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64",
47+
disabledReason = "The Couchbase image has no ARM support")
4448
class DataCouchbaseTestWithIncludeFilterIntegrationTests {
4549

4650
private static final String BUCKET_NAME = "cbbucket";

0 commit comments

Comments
 (0)