提交 0150209e 编写于 作者: S Stephen Connolly

Remove `jenkins.setNodes(jenkins.getNodes())` style hacks to force the master...

Remove `jenkins.setNodes(jenkins.getNodes())` style hacks to force the master number of executors to be updated
上级 6a1ed280
......@@ -400,7 +400,6 @@ public class AbstractProjectTest extends HudsonTestCase {
public void testQueueSuccessBehavior() {
// prevent any builds to test the behaviour
jenkins.numExecutors = 0;
jenkins.updateComputerList(false);
def p = createFreeStyleProject()
def f = p.scheduleBuild2(0)
......@@ -419,7 +418,6 @@ public class AbstractProjectTest extends HudsonTestCase {
public void testQueueSuccessBehaviorOverHTTP() {
// prevent any builds to test the behaviour
jenkins.numExecutors = 0;
jenkins.updateComputerList(false);
def p = createFreeStyleProject()
def wc = createWebClient();
......
......@@ -34,7 +34,6 @@ public class ExecutorTest {
@Test
public void yank() throws Exception {
j.jenkins.setNumExecutors(1);
j.jenkins.updateComputerList(true);
Computer c = j.jenkins.toComputer();
final Executor e = c.getExecutors().get(0);
......@@ -59,7 +58,6 @@ public class ExecutorTest {
@Issue("JENKINS-4756")
public void whenAnExecutorIsYankedANewExecutorTakesItsPlace() throws Exception {
j.jenkins.setNumExecutors(1);
j.jenkins.updateComputerList(true);
Computer c = j.jenkins.toComputer();
Executor e = getExecutorByNumber(c, 0);
......
......@@ -48,7 +48,6 @@ public class GetEnvironmentOutsideBuildTest extends HudsonTestCase {
private void restoreOldNumExecutors() throws IOException {
Jenkins.getInstance().setNumExecutors(this.oldExecNum);
Jenkins.getInstance().setNodes(Jenkins.getInstance().getNodes());
assertNotNull(Jenkins.getInstance().toComputer());
}
......@@ -64,8 +63,6 @@ public class GetEnvironmentOutsideBuildTest extends HudsonTestCase {
private void whenJenkinsMasterHasNoExecutors() throws IOException {
Jenkins.getInstance().setNumExecutors(0);
// force update of nodes:
Jenkins.getInstance().setNodes(Jenkins.getInstance().getNodes());
assertNull(Jenkins.getInstance().toComputer());
}
......
......@@ -112,7 +112,6 @@ public class QueueTest {
// prevent execution to push stuff into the queue
r.jenkins.setNumExecutors(0);
r.jenkins.setNodes(r.jenkins.getNodes());
FreeStyleProject testProject = r.createFreeStyleProject("test");
testProject.scheduleBuild(new UserIdCause());
......@@ -161,7 +160,6 @@ public class QueueTest {
// prevent execution to push stuff into the queue
r.jenkins.setNumExecutors(0);
r.jenkins.setNodes(r.jenkins.getNodes());
FreeStyleProject testProject = r.createFreeStyleProject("test");
testProject.scheduleBuild(new UserIdCause());
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册