From 19c2506476a46aea70ea151472bb21bcfc801224 Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Mon, 12 Jan 2026 12:23:48 +0100 Subject: [PATCH] Do not restart contexts if pausing is disabled If the PauseMode is set to NEVER, we never pause contexts and therefore do not need to restart them. See gh-36117 --- .../test/context/cache/DefaultContextCache.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/spring-test/src/main/java/org/springframework/test/context/cache/DefaultContextCache.java b/spring-test/src/main/java/org/springframework/test/context/cache/DefaultContextCache.java index 8956273342d..529af02e8c9 100644 --- a/spring-test/src/main/java/org/springframework/test/context/cache/DefaultContextCache.java +++ b/spring-test/src/main/java/org/springframework/test/context/cache/DefaultContextCache.java @@ -172,13 +172,15 @@ public class DefaultContextCache implements ContextCache { } private void restartContextIfNecessary(ApplicationContext context) { - // Recurse up the context hierarchy first. - ApplicationContext parent = context.getParent(); - if (parent != null) { - restartContextIfNecessary(parent); - } - if (context instanceof ConfigurableApplicationContext cac && !cac.isRunning()) { - cac.restart(); + if (this.pauseMode != PauseMode.NEVER) { + // Recurse up the context hierarchy first. + ApplicationContext parent = context.getParent(); + if (parent != null) { + restartContextIfNecessary(parent); + } + if (context instanceof ConfigurableApplicationContext cac && !cac.isRunning()) { + cac.restart(); + } } }