Skip to content

Commit d7a9f87

Browse files
committed
Disable Neo4j tests on aarch64 linux and mac
See gh-35228
1 parent 9f109fe commit d7a9f87

File tree

7 files changed

+28
-0
lines changed

7 files changed

+28
-0
lines changed

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/neo4j/Neo4jReactiveHealthIndicatorIntegrationTests.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
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.containers.Neo4jContainer;
2324
import org.testcontainers.junit.jupiter.Container;
2425
import org.testcontainers.junit.jupiter.Testcontainers;
@@ -29,6 +30,7 @@
2930
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
3031
import org.springframework.boot.autoconfigure.neo4j.Neo4jAutoConfiguration;
3132
import org.springframework.boot.test.context.SpringBootTest;
33+
import org.springframework.boot.testsupport.junit.DisabledOnOs;
3234
import org.springframework.boot.testsupport.testcontainers.DockerImageNames;
3335
import org.springframework.context.annotation.Configuration;
3436
import org.springframework.context.annotation.Import;
@@ -44,6 +46,8 @@
4446
*/
4547
@SpringBootTest
4648
@Testcontainers(disabledWithoutDocker = true)
49+
@DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64",
50+
disabledReason = "The Neo4j image has no ARM support")
4751
public class Neo4jReactiveHealthIndicatorIntegrationTests {
4852

4953
// gh-33428

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jRepositoriesAutoConfigurationIntegrationTests.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
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.containers.Neo4jContainer;
2324
import org.testcontainers.junit.jupiter.Container;
2425
import org.testcontainers.junit.jupiter.Testcontainers;
@@ -28,6 +29,7 @@
2829
import org.springframework.boot.autoconfigure.data.neo4j.country.CountryRepository;
2930
import org.springframework.boot.autoconfigure.neo4j.Neo4jAutoConfiguration;
3031
import org.springframework.boot.test.context.SpringBootTest;
32+
import org.springframework.boot.testsupport.junit.DisabledOnOs;
3133
import org.springframework.boot.testsupport.testcontainers.DockerImageNames;
3234
import org.springframework.context.annotation.Configuration;
3335
import org.springframework.data.neo4j.repository.config.EnableNeo4jRepositories;
@@ -43,6 +45,8 @@
4345
*/
4446
@SpringBootTest
4547
@Testcontainers(disabledWithoutDocker = true)
48+
@DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64",
49+
disabledReason = "The Neo4j image has no ARM support")
4650
class Neo4jRepositoriesAutoConfigurationIntegrationTests {
4751

4852
@Container

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/neo4j/Neo4jAutoConfigurationIntegrationTests.java

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

2121
import org.junit.jupiter.api.Test;
22+
import org.junit.jupiter.api.condition.OS;
2223
import org.neo4j.driver.Driver;
2324
import org.neo4j.driver.Result;
2425
import org.neo4j.driver.Session;
@@ -30,6 +31,7 @@
3031
import org.springframework.beans.factory.annotation.Autowired;
3132
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
3233
import org.springframework.boot.test.context.SpringBootTest;
34+
import org.springframework.boot.testsupport.junit.DisabledOnOs;
3335
import org.springframework.boot.testsupport.testcontainers.DockerImageNames;
3436
import org.springframework.context.annotation.Configuration;
3537
import org.springframework.test.context.DynamicPropertyRegistry;
@@ -45,6 +47,8 @@
4547
*/
4648
@SpringBootTest
4749
@Testcontainers(disabledWithoutDocker = true)
50+
@DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64",
51+
disabledReason = "The Neo4j image has no ARM support")
4852
class Neo4jAutoConfigurationIntegrationTests {
4953

5054
@Container

spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestIntegrationTests.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.containers.Neo4jContainer;
2324
import org.testcontainers.junit.jupiter.Container;
2425
import org.testcontainers.junit.jupiter.Testcontainers;
2526

2627
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
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.ApplicationContext;
3032
import org.springframework.data.neo4j.core.Neo4jTemplate;
@@ -43,6 +45,8 @@
4345
*/
4446
@DataNeo4jTest
4547
@Testcontainers(disabledWithoutDocker = true)
48+
@DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64",
49+
disabledReason = "The Neo4j image has no ARM support")
4650
class DataNeo4jTestIntegrationTests {
4751

4852
@Container

spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestPropertiesIntegrationTests.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,13 @@
2020

2121
import org.junit.jupiter.api.Nested;
2222
import org.junit.jupiter.api.Test;
23+
import org.junit.jupiter.api.condition.OS;
2324
import org.testcontainers.containers.Neo4jContainer;
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.core.env.Environment;
3032
import org.springframework.test.context.DynamicPropertyRegistry;
@@ -40,6 +42,8 @@
4042
*/
4143
@Testcontainers(disabledWithoutDocker = true)
4244
@DataNeo4jTest(properties = "spring.profiles.active=test")
45+
@DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64",
46+
disabledReason = "The Neo4j image has no ARM support")
4347
class DataNeo4jTestPropertiesIntegrationTests {
4448

4549
@Container

spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestReactiveIntegrationTests.java

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

2121
import org.junit.jupiter.api.Test;
22+
import org.junit.jupiter.api.condition.OS;
2223
import org.neo4j.driver.Driver;
2324
import org.testcontainers.containers.Neo4jContainer;
2425
import org.testcontainers.junit.jupiter.Container;
@@ -29,6 +30,7 @@
2930
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
3031
import org.springframework.beans.factory.annotation.Autowired;
3132
import org.springframework.boot.test.context.TestConfiguration;
33+
import org.springframework.boot.testsupport.junit.DisabledOnOs;
3234
import org.springframework.boot.testsupport.testcontainers.DockerImageNames;
3335
import org.springframework.context.ApplicationContext;
3436
import org.springframework.context.annotation.Bean;
@@ -52,6 +54,8 @@
5254
@DataNeo4jTest
5355
@Transactional(propagation = Propagation.NOT_SUPPORTED)
5456
@Testcontainers(disabledWithoutDocker = true)
57+
@DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64",
58+
disabledReason = "The Neo4j image has no ARM support")
5559
class DataNeo4jTestReactiveIntegrationTests {
5660

5761
@Container

spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestWithIncludeFilterIntegrationTests.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,13 @@
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.containers.Neo4jContainer;
2324
import org.testcontainers.junit.jupiter.Container;
2425
import org.testcontainers.junit.jupiter.Testcontainers;
2526

2627
import org.springframework.beans.factory.annotation.Autowired;
28+
import org.springframework.boot.testsupport.junit.DisabledOnOs;
2729
import org.springframework.boot.testsupport.testcontainers.DockerImageNames;
2830
import org.springframework.context.annotation.ComponentScan.Filter;
2931
import org.springframework.stereotype.Service;
@@ -40,6 +42,8 @@
4042
*/
4143
@Testcontainers(disabledWithoutDocker = true)
4244
@DataNeo4jTest(includeFilters = @Filter(Service.class))
45+
@DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64",
46+
disabledReason = "The Neo4j image has no ARM support")
4347
class DataNeo4jTestWithIncludeFilterIntegrationTests {
4448

4549
@Container

0 commit comments

Comments
 (0)