diff --git a/changelog.html b/changelog.html
index ffb290cc85..6acbb59328 100644
--- a/changelog.html
+++ b/changelog.html
@@ -61,6 +61,9 @@ Upcoming changes
diff --git a/core/src/main/java/hudson/model/AbstractBuild.java b/core/src/main/java/hudson/model/AbstractBuild.java
index f100573d81..880354b4e9 100644
--- a/core/src/main/java/hudson/model/AbstractBuild.java
+++ b/core/src/main/java/hudson/model/AbstractBuild.java
@@ -269,7 +269,7 @@ public abstract class AbstractBuild,R extends Abs
R p = getPreviousCompletedBuild();
if (p !=null && isBuilding()) {
Result pr = p.getResult();
- if (pr!=null && pr.isWorseThan(Result.UNSTABLE)) {
+ if (pr!=null && pr.isWorseThan(Result.SUCCESS)) {
// we are still building, so this is just the current latest information,
// but we seems to be failing so far, so inherit culprits from the previous build.
// isBuilding() check is to avoid recursion when loading data from old Hudson, which doesn't record
diff --git a/test/src/main/java/org/jvnet/hudson/test/FakeChangeLogSCM.java b/test/src/main/java/org/jvnet/hudson/test/FakeChangeLogSCM.java
new file mode 100644
index 0000000000..cfbeed9702
--- /dev/null
+++ b/test/src/main/java/org/jvnet/hudson/test/FakeChangeLogSCM.java
@@ -0,0 +1,142 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2011, CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.jvnet.hudson.test;
+
+import hudson.FilePath;
+import hudson.Launcher;
+import hudson.model.AbstractBuild;
+import hudson.model.AbstractProject;
+import hudson.model.BuildListener;
+import hudson.model.InvisibleAction;
+import hudson.model.JobProperty;
+import hudson.model.User;
+import hudson.scm.ChangeLogParser;
+import hudson.scm.ChangeLogSet;
+import hudson.scm.ChangeLogSet.Entry;
+import hudson.scm.NullSCM;
+import org.xml.sax.SAXException;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * Fake SCM implementation that can report arbitrary commits from arbitrary users.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public class FakeChangeLogSCM extends NullSCM {
+
+ /**
+ * Changes to be reported in the next build.
+ */
+ private List entries = new ArrayList();
+
+ public EntryImpl addChange() {
+ EntryImpl e = new EntryImpl();
+ entries.add(e);
+ return e;
+ }
+
+ @Override
+ public boolean checkout(AbstractBuild, ?> build, Launcher launcher, FilePath remoteDir, BuildListener listener, File changeLogFile) throws IOException, InterruptedException {
+ new FilePath(changeLogFile).touch(0);
+ build.addAction(new ChangelogAction(entries));
+ entries = new ArrayList();
+ return true;
+ }
+
+ @Override
+ public ChangeLogParser createChangeLogParser() {
+ return new FakeChangeLogParser();
+ }
+
+ public static class ChangelogAction extends InvisibleAction {
+ private final List entries;
+
+ public ChangelogAction(List entries) {
+ this.entries = entries;
+ }
+ }
+
+ public static class FakeChangeLogParser extends ChangeLogParser {
+ @Override
+ public FakeChangeLogSet parse(AbstractBuild build, File changelogFile) throws IOException, SAXException {
+ return new FakeChangeLogSet(build, build.getAction(ChangelogAction.class).entries);
+ }
+ }
+
+ public static class FakeChangeLogSet extends ChangeLogSet {
+ private List entries;
+
+ public FakeChangeLogSet(AbstractBuild, ?> build, List entries) {
+ super(build);
+ this.entries = entries;
+ }
+
+ @Override
+ public boolean isEmptySet() {
+ return entries.isEmpty();
+ }
+
+ public Iterator iterator() {
+ return entries.iterator();
+ }
+ }
+
+ public static class EntryImpl extends Entry {
+ private String msg = "some commit message";
+ private String author = "someone";
+
+ public EntryImpl withAuthor(String author) {
+ this.author = author;
+ return this;
+ }
+
+ public EntryImpl withMsg(String msg) {
+ this.msg = msg;
+ return this;
+ }
+
+ @Override
+ public String getMsg() {
+ return msg;
+ }
+
+ @Override
+ public User getAuthor() {
+ return User.get(author);
+ }
+
+ @Override
+ public Collection getAffectedPaths() {
+ return Collections.singleton("path");
+ }
+ }
+}
diff --git a/test/src/test/groovy/hudson/model/AbstractBuildTest.groovy b/test/src/test/groovy/hudson/model/AbstractBuildTest.groovy
index a53865058f..970b71afd2 100644
--- a/test/src/test/groovy/hudson/model/AbstractBuildTest.groovy
+++ b/test/src/test/groovy/hudson/model/AbstractBuildTest.groovy
@@ -30,6 +30,10 @@ import hudson.slaves.EnvironmentVariablesNodeProperty.Entry
import junit.framework.Assert
import org.jvnet.hudson.test.CaptureEnvironmentBuilder
import org.jvnet.hudson.test.GroovyHudsonTestCase
+import org.jvnet.hudson.test.ExtractResourceWithChangesSCM
+import org.jvnet.hudson.test.FakeChangeLogSCM
+import org.jvnet.hudson.test.FailureBuilder
+import org.jvnet.hudson.test.UnstableBuilder
public class AbstractBuildTest extends GroovyHudsonTestCase {
void testVariablesResolved() {
@@ -61,4 +65,53 @@ public class AbstractBuildTest extends GroovyHudsonTestCase {
println "Output:\n"+rsp.webResponse.contentAsString
assertTrue(rsp.webResponse.contentAsString.contains(out));
}
+
+ def assertCulprits(AbstractBuild b, Collection expectedIds) {
+ assertEquals(expectedIds as Set, b.culprits*.id as Set);
+ }
+
+ void testCulprits() {
+
+ def p = createFreeStyleProject();
+ def scm = new FakeChangeLogSCM()
+ p.scm = scm
+
+ // 1st build, successful, no culprits
+ scm.addChange().withAuthor("alice")
+ def b = assertBuildStatus(Result.SUCCESS,p.scheduleBuild2(0).get())
+ assertCulprits(b,["alice"])
+
+ // 2nd build
+ scm.addChange().withAuthor("bob")
+ p.buildersList.add(new FailureBuilder())
+ b = assertBuildStatus(Result.FAILURE,p.scheduleBuild2(0).get())
+ assertCulprits(b,["bob"])
+
+ // 3rd build. bob continues to be in culprit
+ scm.addChange().withAuthor("charlie")
+ b = assertBuildStatus(Result.FAILURE,p.scheduleBuild2(0).get())
+ assertCulprits(b,["bob","charlie"])
+
+ // 4th build, unstable. culprit list should continue
+ scm.addChange().withAuthor("dave")
+ p.buildersList.replaceBy([new UnstableBuilder()])
+ b = assertBuildStatus(Result.UNSTABLE,p.scheduleBuild2(0).get())
+ assertCulprits(b,["bob","charlie","dave"])
+
+ // 5th build, unstable. culprit list should continue
+ scm.addChange().withAuthor("eve")
+ b = assertBuildStatus(Result.UNSTABLE,p.scheduleBuild2(0).get())
+ assertCulprits(b,["bob","charlie","dave","eve"])
+
+ // 6th build, success, accumulation continues up to this point
+ scm.addChange().withAuthor("fred")
+ p.buildersList.replaceBy([])
+ b = assertBuildStatus(Result.SUCCESS,p.scheduleBuild2(0).get())
+ assertCulprits(b,["bob","charlie","dave","eve","fred"])
+
+ // 7th build, back to empty culprits
+ scm.addChange().withAuthor("george")
+ b = assertBuildStatus(Result.SUCCESS,p.scheduleBuild2(0).get())
+ assertCulprits(b,["george"])
+ }
}