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

test/src/test/groovy/hudson/model/AbstractProjectTest.groovy

 /*
  * The MIT License
- * 
+ *
  * Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
- * 
+ *
  * 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
@@ -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();

test/src/test/java/hudson/model/ExecutorTest.java

@@ -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);

test/src/test/java/hudson/model/GetEnvironmentOutsideBuildTest.java

@@ -20,27 +20,27 @@ import org.jvnet.hudson.test.HudsonTestCase;
 
 /**
  * Tests that getEnvironment() calls outside of builds are safe.
- * 
+ *
  * @author kutzi
  */
 @Issue("JENKINS-11592")
 public class GetEnvironmentOutsideBuildTest extends HudsonTestCase {
 
     private int oldExecNum;
-    
+
     @Override
     protected void runTest() throws Throwable {
         // Disable tests
-        
+
         // It's unfortunately not working, yet, as whenJenkinsMasterHasNoExecutors is not working as expected
     }
 
     public void setUp() throws Exception {
         super.setUp();
-        
+
         this.oldExecNum = Jenkins.getInstance().getNumExecutors();
     }
-    
+
     public void tearDown() throws Exception {
         restoreOldNumExecutors();
         super.tearDown();
@@ -48,10 +48,9 @@ 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());
     }
-    
+
     private MavenModuleSet createSimpleMavenProject() throws Exception {
         MavenModuleSet project = createMavenProject();
         MavenInstallation mi = configureMaven3();
@@ -61,36 +60,34 @@ public class GetEnvironmentOutsideBuildTest extends HudsonTestCase {
         project.setGoals("validate");
         return project;
     }
-    
+
     private void whenJenkinsMasterHasNoExecutors() throws IOException {
         Jenkins.getInstance().setNumExecutors(0);
-        // force update of nodes:
-        Jenkins.getInstance().setNodes(Jenkins.getInstance().getNodes());
         assertNull(Jenkins.getInstance().toComputer());
     }
-    
+
     public void testMaven() throws Exception {
         MavenModuleSet m = createSimpleMavenProject();
-        
+
         assertGetEnvironmentCallOutsideBuildWorks(m);
     }
-    
+
     public void testFreestyle() throws Exception {
         FreeStyleProject project = createFreeStyleProject();
-        
+
         assertGetEnvironmentCallOutsideBuildWorks(project);
     }
-    
+
     public void testMatrix() throws Exception {
         MatrixProject createMatrixProject = createMatrixProject();
-        
+
         assertGetEnvironmentCallOutsideBuildWorks(createMatrixProject);
     }
-    
+
     @SuppressWarnings({"rawtypes", "unchecked"})
     private void assertGetEnvironmentCallOutsideBuildWorks(AbstractProject job) throws Exception {
         AbstractBuild build = buildAndAssertSuccess(job);
-        
+
         assertGetEnvironmentWorks(build);
     }
 

test/src/test/java/hudson/model/QueueTest.java

 /*
  * The MIT License
- * 
+ *
  * Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
- * 
+ *
  * 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
@@ -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());
@@ -129,7 +128,7 @@ public class QueueTest {
         assertEquals(1, q.getItems().length);
 
         // did it bind back to the same object?
-        assertSame(q.getItems()[0].task,testProject);        
+        assertSame(q.getItems()[0].task,testProject);
     }
 
     /**
@@ -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());
@@ -392,7 +390,7 @@ public class QueueTest {
         assertEquals(1, runs.size());
         assertEquals("slave0", runs.get(0).getBuiltOnStr());
     }
-    
+
     @Issue("JENKINS-10944")
     @Test public void flyweightTasksBlockedByShutdown() throws Exception {
         r.jenkins.doQuietDown(true, 0);
@@ -585,8 +583,8 @@ public class QueueTest {
                      @Override
                     public Label getAssignedLabel(){
                         throw new IllegalArgumentException("Test exception"); //cause dead of executor
-                    }   
-                     
+                    }
+
                     @Override
                      public void save(){
                          //do not need save
@@ -613,7 +611,7 @@ public class QueueTest {
                     break; // executor is dead due to exception
              }
              if(e.isIdle()){
-                 assertTrue("Node went to idle before project had" + project2.getDisplayName() + " been started", v.isDone());   
+                 assertTrue("Node went to idle before project had" + project2.getDisplayName() + " been started", v.isDone());
              }
                 Thread.sleep(1000);
         }
@@ -622,37 +620,37 @@ public class QueueTest {
         Queue.getInstance().cancel(projectError); // cancel job which cause dead of executor
         e.doYank(); //restart executor
         while(!e.isIdle()){ //executor should take project2 from queue
-            Thread.sleep(1000); 
+            Thread.sleep(1000);
         }
         //project2 should not be in pendings
         List<Queue.BuildableItem> items = Queue.getInstance().getPendingItems();
         for(Queue.BuildableItem item : items){
-            assertFalse("Project " + project2.getDisplayName() + " stuck in pendings",item.task.getName().equals(project2.getName())); 
+            assertFalse("Project " + project2.getDisplayName() + " stuck in pendings",item.task.getName().equals(project2.getName()));
         }
     }
-    
+
     @Test public void cancelInQueue() throws Exception {
         // parepare an offline slave.
         DumbSlave slave = r.createOnlineSlave();
         assertFalse(slave.toComputer().isOffline());
         slave.toComputer().disconnect(null).get();
         assertTrue(slave.toComputer().isOffline());
-        
+
         FreeStyleProject p = r.createFreeStyleProject();
         p.setAssignedNode(slave);
-        
+
         QueueTaskFuture<FreeStyleBuild> f = p.scheduleBuild2(0);
         try {
             f.get(3, TimeUnit.SECONDS);
             fail("Should time out (as the slave is offline).");
         } catch (TimeoutException e) {
         }
-        
+
         Queue.Item item = Queue.getInstance().getItem(p);
         assertNotNull(item);
         Queue.getInstance().doCancelItem(item.getId());
         assertNull(Queue.getInstance().getItem(p));
-        
+
         try {
             f.get(10, TimeUnit.SECONDS);
             fail("Should not get (as it is cancelled).");