set process to null when stop Jenkins hit timeout

jenkinsci · Jul 26, 2022 · 6a1fdad · 6a1fdad
1 parent 0038ef9
commit 6a1fdad
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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) {