From 5cd4c63ccbb671c8bd8a2ea313c29b0ed6f9bcd2 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 14 Sep 2013 16:04:37 -0700 Subject: [PATCH] fixing a test failure --- core/src/main/java/hudson/model/Executor.java | 1 - .../test/java/hudson/model/ExecutorTest.java | 20 ++++++++++++------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/core/src/main/java/hudson/model/Executor.java b/core/src/main/java/hudson/model/Executor.java index a8dc72f06d..bc95b8c3a1 100644 --- a/core/src/main/java/hudson/model/Executor.java +++ b/core/src/main/java/hudson/model/Executor.java @@ -268,7 +268,6 @@ public class Executor extends Thread implements ModelObject { */ public void killHard() { induceDeath = true; - interrupt(); } /** diff --git a/test/src/test/java/hudson/model/ExecutorTest.java b/test/src/test/java/hudson/model/ExecutorTest.java index 47d6f449ed..25234935a9 100644 --- a/test/src/test/java/hudson/model/ExecutorTest.java +++ b/test/src/test/java/hudson/model/ExecutorTest.java @@ -18,8 +18,10 @@ import java.util.concurrent.Future; */ public class ExecutorTest extends HudsonTestCase { public void testYank() throws Exception { - Computer c = Jenkins.getInstance().toComputer(); - Executor e = c.getExecutors().get(0); + jenkins.setNumExecutors(1); + jenkins.updateComputerList(true); + Computer c = jenkins.toComputer(); + final Executor e = c.getExecutors().get(0); // kill an executor kill(e); @@ -35,21 +37,23 @@ public class ExecutorTest extends HudsonTestCase { submit(p.getFormByName("yank")); assertFalse(c.getExecutors().contains(e)); - waitUntilExecutorSizeIs(c, 2); + waitUntilExecutorSizeIs(c, 1); } @Bug(4756) public void testWhenAnExecuterIsYankedANewExecuterTakesItsPlace() throws Exception { + jenkins.setNumExecutors(1); + jenkins.updateComputerList(true); + Computer c = jenkins.toComputer(); Executor e = getExecutorByNumber(c, 0); kill(e); e.doYank(); - waitUntilExecutorSizeIs(c, 2); + waitUntilExecutorSizeIs(c, 1); assertNotNull(getExecutorByNumber(c, 0)); - assertNotNull(getExecutorByNumber(c, 1)); } private void waitUntilExecutorSizeIs(Computer c, int executorCollectionSize) throws InterruptedException { @@ -60,9 +64,11 @@ public class ExecutorTest extends HudsonTestCase { } } - private void kill(Executor e) throws InterruptedException { + private void kill(Executor e) throws InterruptedException, IOException { e.killHard(); - while (e.isAlive()) + // trigger a new build which causes the forced death of the executor + createFreeStyleProject().scheduleBuild2(0); + while (e.isActive()) Thread.sleep(10); }