diff --git a/src/main/java/org/jvnet/hudson/test/RealJenkinsRule.java b/src/main/java/org/jvnet/hudson/test/RealJenkinsRule.java index d856b02e4..075e811ed 100644 --- a/src/main/java/org/jvnet/hudson/test/RealJenkinsRule.java +++ b/src/main/java/org/jvnet/hudson/test/RealJenkinsRule.java @@ -620,7 +620,8 @@ public void stopJenkins() throws Throwable { if (!proc.waitFor(60, TimeUnit.SECONDS) ) { System.err.println("Jenkins failed to stop within 60 seconds, attempting to kill the Jenkins process"); proc.destroyForcibly(); - throw new AssertionError("Jenkins failed to terminate within 60 seconds"); + proc = null; + return; } int exitValue = proc.exitValue(); if (exitValue != 0) {