From b8021dbc65448eb60201f7a926bbab72b0b80c00 Mon Sep 17 00:00:00 2001 From: Moritz Halbritter Date: Tue, 12 Dec 2023 16:07:10 +0100 Subject: [PATCH] Exclude Rabbit Stream when testing RabbitAutoConfiguration The stream auto-configuration is tested in RabbitStreamConfigurationTests, and excluding it prevents the creation of the "rabbitStreamEnvironment" Environment bean, which delays the application context close by 1 second because it has to wait for some Netty resources to gracefully shut down. Closes gh-38750 --- .../boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java index a53b482e60c..608b631bb60 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java @@ -58,6 +58,7 @@ import org.springframework.amqp.rabbit.retry.MessageRecoverer; import org.springframework.amqp.support.converter.MessageConverter; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.boot.autoconfigure.AutoConfigurations; +import org.springframework.boot.test.context.FilteredClassLoader; import org.springframework.boot.test.context.assertj.AssertableApplicationContext; import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.boot.test.system.CapturedOutput; @@ -104,7 +105,8 @@ import static org.mockito.Mockito.mock; class RabbitAutoConfigurationTests { private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() - .withConfiguration(AutoConfigurations.of(RabbitAutoConfiguration.class)); + .withConfiguration(AutoConfigurations.of(RabbitAutoConfiguration.class)) + .withClassLoader(new FilteredClassLoader("org.springframework.rabbit.stream")); // gh-38750 @Test void testDefaultRabbitConfiguration() {