From bae13974728bf7719a1ca37fbd8a8405770eece2 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Mon, 21 Dec 2009 23:28:20 +0000 Subject: [PATCH] improved error diagnostics in case of a test failure git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@24794 71c3de6d-444a-0410-be80-ed276b4c234a --- .../org/jvnet/hudson/test/HudsonTestCase.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java index d70696d56f..0d4a924e46 100644 --- a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java +++ b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java @@ -33,6 +33,8 @@ import hudson.ExtensionList; import hudson.DescriptorExtensionList; import hudson.Util; import hudson.model.Computer; +import hudson.model.Executor; +import hudson.model.Queue.Executable; import hudson.tools.ToolProperty; import hudson.remoting.Which; import hudson.Launcher.LocalLauncher; @@ -788,8 +790,17 @@ public abstract class HudsonTestCase extends TestCase implements RootAction { if (streak>5) // the system is quiet for a while return; - if (System.currentTimeMillis()-startTime > timeout) - throw new AssertionError("Hudson is still doing something after "+timeout+"ms"); + if (System.currentTimeMillis()-startTime > timeout) { + List building = new ArrayList(); + for (Computer c : hudson.getComputers()) { + for (Executor e : c.getExecutors()) { + if (e.isBusy()) + building.add(e.getCurrentExecutable()); + } + } + throw new AssertionError(String.format("Hudson is still doing something after %dms: queue=%s building=%s", + timeout, Arrays.asList(hudson.getQueue().getItems()), building)); + } } }