From dade9a6569764b4c56dfc8b7346f2045f349c280 Mon Sep 17 00:00:00 2001 From: mindless Date: Fri, 13 Feb 2009 23:22:36 +0000 Subject: [PATCH] add default='test' in build.xml for testBuildAxisInAnt, to avoid failure from ant saying default attribute is required. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@15325 71c3de6d-444a-0410-be80-ed276b4c234a --- test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java | 5 ++--- test/src/test/java/hudson/matrix/MatrixProjectTest.java | 5 +++-- 2 files changed, 5 insertions(+), 5 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 f4f0f7b28c..34baf35886 100644 --- a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java +++ b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java @@ -428,9 +428,8 @@ public abstract class HudsonTestCase extends TestCase { if(status==r.getResult()) return r; - // dump the build output - System.out.println(r.getLog()); - assertEquals(status,r.getResult()); + // dump the build output in failure message + assertEquals("unexpected build status; build log was:\n------\n" + r.getLog() + "\n------\n", status,r.getResult()); return r; } diff --git a/test/src/test/java/hudson/matrix/MatrixProjectTest.java b/test/src/test/java/hudson/matrix/MatrixProjectTest.java index 1dcdefbe7a..97a065c0d9 100644 --- a/test/src/test/java/hudson/matrix/MatrixProjectTest.java +++ b/test/src/test/java/hudson/matrix/MatrixProjectTest.java @@ -23,6 +23,7 @@ */ package hudson.matrix; +import hudson.model.Cause; import hudson.model.Result; import hudson.tasks.Ant; import hudson.tasks.Maven; @@ -44,9 +45,9 @@ public class MatrixProjectTest extends HudsonTestCase { p.getBuildersList().add(new Ant("-Dprop=${db} test",null,null,null,null)); // we need a dummy build script that echos back our property - p.setScm(new SingleFileSCM("build.xml","assertion ${prop}=${db}")); + p.setScm(new SingleFileSCM("build.xml","assertion ${prop}=${db}")); - MatrixBuild build = p.scheduleBuild2(0).get(); + MatrixBuild build = p.scheduleBuild2(0, new Cause.UserCause()).get(); List runs = build.getRuns(); assertEquals(4,runs.size()); for (MatrixRun run : runs) {