Tolerate race condition in shouldStopKeepAliveThreadIfContextIsClosed

See gh-37736
spring-projects · Oct 20, 2023 · d22969a · d22969a
1 parent 4161eb1
commit d22969a
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/...ot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java b/...ot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java
@@ -16,6 +16,7 @@
 
 package org.springframework.boot;
 
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -31,6 +32,7 @@
 
 import jakarta.annotation.PostConstruct;
 import org.assertj.core.api.Condition;
+import org.awaitility.Awaitility;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -1423,7 +1425,11 @@ void shouldStopKeepAliveThreadIfContextIsClosed() {
 		assertThat(threadsBeforeClose).filteredOn((thread) -> thread.getName().equals("keep-alive")).isNotEmpty();
 		this.context.close();
 		Set<Thread> threadsAfterClose = getCurrentThreads();
-		assertThat(threadsAfterClose).filteredOn((thread) -> thread.getName().equals("keep-alive")).isEmpty();
+		Awaitility.await()
+			.atMost(Duration.ofSeconds(30))
+			.untilAsserted(
+					() -> assertThat(threadsAfterClose).filteredOn((thread) -> thread.getName().equals("keep-alive"))
+						.isEmpty());
 	}
 
 	private <S extends AvailabilityState> ArgumentMatcher<ApplicationEvent> isAvailabilityChangeEventWithState(