Skip to content

Commit fc9c1c0

Browse files
committed
Fix ordering related issue in ReactorAutoConfigurationTests
See gh-34201
1 parent ec3c6ae commit fc9c1c0

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/reactor/ReactorAutoConfigurationTests.java

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

2121
import io.micrometer.context.ContextRegistry;
2222
import org.junit.jupiter.api.AfterAll;
23+
import org.junit.jupiter.api.AfterEach;
2324
import org.junit.jupiter.api.BeforeAll;
25+
import org.junit.jupiter.api.BeforeEach;
2426
import org.junit.jupiter.api.Test;
27+
import reactor.core.publisher.Hooks;
2528
import reactor.core.publisher.Mono;
2629
import reactor.util.context.Context;
2730

@@ -45,6 +48,12 @@ class ReactorAutoConfigurationTests {
4548

4649
private static final ThreadLocal<String> THREADLOCAL_VALUE = ThreadLocal.withInitial(() -> "initial");
4750

51+
@BeforeEach
52+
@AfterEach
53+
void resetStaticState() {
54+
Hooks.disableAutomaticContextPropagation();
55+
}
56+
4857
@BeforeAll
4958
static void initializeThreadLocalAccessors() {
5059
ContextRegistry globalRegistry = ContextRegistry.getInstance();

0 commit comments

Comments
 (0)