Add test for case then project was re-enabled

jenkinsci · Dec 26, 2016 · 5fb9c3f · 5fb9c3f
1 parent eea855c
commit 5fb9c3f
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 0 deletions.
diff --git a/src/main/java/hudson/plugins/parameterizedtrigger/TriggerBuilder.java b/src/main/java/hudson/plugins/parameterizedtrigger/TriggerBuilder.java
@@ -145,6 +145,8 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher,
                                     } else {
                                         buildStepResult = false;
                                     }
+                                } else {
+                                    listener.getLogger().println("Skipping " + HyperlinkNote.encodeTo('/'+ p.getUrl(), p.getFullDisplayName()) + ". The project was disabled.");
                                 }
                             } catch (CancellationException x) {
                                 throw new AbortException(p.getFullDisplayName() +" aborted.");

diff --git a/src/test/java/hudson/plugins/parameterizedtrigger/test/TriggerBuilderTest.java b/src/test/java/hudson/plugins/parameterizedtrigger/test/TriggerBuilderTest.java
@@ -23,6 +23,9 @@
  */
 package hudson.plugins.parameterizedtrigger.test;
 
+import com.google.common.collect.ArrayListMultimap;
+import hudson.EnvVars;
+import hudson.Launcher;
 import hudson.model.*;
 import hudson.model.Cause.UpstreamCause;
 import hudson.plugins.parameterizedtrigger.AbstractBuildParameterFactory;
@@ -49,6 +52,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.ListIterator;
+import java.util.concurrent.Future;
 import java.util.regex.Pattern;
 import java.util.regex.Matcher;
 import java.io.IOException;
@@ -60,11 +64,14 @@
 import jenkins.model.Jenkins;
 import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.JenkinsRule;
+import org.mockito.Mockito;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.when;
 
 public class TriggerBuilderTest {
 
@@ -75,6 +82,34 @@ private BlockableBuildTriggerConfig createTriggerConfig(String projects) {
         return new BlockableBuildTriggerConfig(projects, new BlockingBehaviour("never", "never", "never"), null);
     }
 
+    @Test
+    public void testProjectWasEnabledDuringTheBuild() throws Exception {
+        final Project<?, ?> triggerProject = r.createFreeStyleProject("projectA");
+        final Project<?, ?> disabledJob = r.createFreeStyleProject("projectC");
+        final BlockableBuildTriggerConfig config = Mockito.mock(BlockableBuildTriggerConfig.class);
+        when(config.getProjects(any(EnvVars.class))).thenReturn(disabledJob.getName());
+        when(config.getBlock()).thenReturn(new BlockingBehaviour(Result.FAILURE, Result.FAILURE, Result.FAILURE));
+
+        final ArrayListMultimap<Job, Future<Run>> futures = ArrayListMultimap.create();
+        when(config.perform3(any(AbstractBuild.class),
+                Mockito.any(Launcher.class),
+                Mockito.any(BuildListener.class))).thenReturn(futures);
+        // Then project is disabled scheduler returns null instead of Future<Run> object
+        futures.put(disabledJob, null);
+
+        final List<Job> jobs = new ArrayList<Job>();
+        jobs.add(disabledJob);
+
+        when(config.getJobs(any(ItemGroup.class), any(EnvVars.class))).thenReturn(jobs);
+
+        TriggerBuilder triggerBuilder = new TriggerBuilder(config);
+        triggerProject.getBuildersList().add(triggerBuilder);
+
+        triggerProject.scheduleBuild2(0).get();
+
+        assertEquals(Result.SUCCESS, triggerProject.getLastBuild().getResult());
+    }
+
     @Test
     public void testOrderOfLogEntries() throws Exception {
         r.createFreeStyleProject("project1");