[FIXED JENKINS-25788] RunMap.remove was always returning false, even when the Run was in fact removed.

(cherry picked from commit ce94579c50)

Conflicts:
	changelog.html
This commit is contained in:
Jesse Glick authored and Oliver Gondža committed 2015-01-06 20:55:46 +01:00
1 parent 21a619f2e0
commit 14d676bb15
2 files changed
+18 -4

No files matched your search

@@ -746,7 +746,7 @@ public abstract class AbstractLazyLoadRunMap<R> extends AbstractMap<Integer,R> i
entrySet.clearCache();
return unwrap(old)!=null;
return old != null;
}
/**
@@ -9,9 +9,6 @@ import org.jvnet.hudson.test.Issue;
import org.jvnet.hudson.test.JenkinsRule;
import org.jvnet.hudson.test.SleepBuilder;
/**
* @author Kohsuke Kawaguchi
*/
public class RunMapTest {
@Rule public JenkinsRule r = new JenkinsRule();
@@ -73,4 +70,21 @@ public class RunMapTest {
private static boolean bombed;
@Issue("JENKINS-25788")
@Test public void remove() throws Exception {
FreeStyleProject p = r.createFreeStyleProject();
FreeStyleBuild b1 = r.buildAndAssertSuccess(p);
FreeStyleBuild b2 = r.buildAndAssertSuccess(p);
RunMap<FreeStyleBuild> runs = p._getRuns();
assertEquals(2, runs.size());
assertTrue(runs.remove(b1));
assertEquals(1, runs.size());
assertFalse(runs.remove(b1));
assertEquals(1, runs.size());
assertTrue(runs.remove(b2));
assertEquals(0, runs.size());
assertFalse(runs.remove(b2));
assertEquals(0, runs.size());
}
}