From 80da8f2958f06aacfddc80adb1d40ea533417c36 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 5 Aug 2014 15:18:19 -0400 Subject: [PATCH] Only helpful to dump threads in case of a timeout. For regular test failures this is normally just annoying noise. --- .../main/java/org/jvnet/hudson/test/JenkinsRule.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java b/test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java index e1c8049ffe..06e62a0524 100644 --- a/test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java +++ b/test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java @@ -386,6 +386,12 @@ public class JenkinsRule implements TestRule, MethodRule, RootAction { public void run() { if (timeoutTimer!=null) { LOGGER.warning(String.format("Test timed out (after %d seconds).", timeout)); + // dump threads + ThreadInfo[] threadInfos = Functions.getThreadInfos(); + Functions.ThreadGroupMap m = Functions.sortThreadsAndGetGroupMap(threadInfos); + for (ThreadInfo ti : threadInfos) { + System.err.println(Functions.dumpThreadInfo(ti, m)); + } testThread.interrupt(); } } @@ -490,12 +496,6 @@ public class JenkinsRule implements TestRule, MethodRule, RootAction { System.err.println("Note: known to randomly fail: " + rf.value()); } - // dump threads - ThreadInfo[] threadInfos = Functions.getThreadInfos(); - Functions.ThreadGroupMap m = Functions.sortThreadsAndGetGroupMap(threadInfos); - for (ThreadInfo ti : threadInfos) { - System.err.println(Functions.dumpThreadInfo(ti, m)); - } throw th; } } finally {