[JENKINS-30206] Fixed branch property propagation.

jenkinsci · May 25, 2016 · 18077ec · 18077ec
1 parent 882717d
commit 18077ec
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/workflow/multibranch/WorkflowBranchProjectFactory.java b/src/main/java/org/jenkinsci/plugins/workflow/multibranch/WorkflowBranchProjectFactory.java
@@ -59,7 +59,7 @@ public class WorkflowBranchProjectFactory extends BranchProjectFactory<WorkflowJ
         try {
             if (property == null) {
                 project.addProperty(new BranchJobProperty(branch));
-            } else if (!property.getBranch().equals(branch)) {
+            } else { // TODO may add equality check if https://github.com/jenkinsci/branch-api-plugin/pull/36 or equivalent is implemented
                 property.setBranch(branch);
                 project.save();
             }

diff --git a/.../java/org/jenkinsci/plugins/workflow/multibranch/NoTriggerBranchPropertyWorkflowTest.java b/.../java/org/jenkinsci/plugins/workflow/multibranch/NoTriggerBranchPropertyWorkflowTest.java
@@ -40,7 +40,6 @@
 import org.jenkinsci.plugins.workflow.steps.scm.GitSampleRepoRule;
 import org.junit.Test;
 import static org.junit.Assert.*;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.JenkinsRule;
@@ -54,7 +53,6 @@ public class NoTriggerBranchPropertyWorkflowTest {
     @Rule public JenkinsRule r = new JenkinsRule();
     @Rule public GitSampleRepoRule sampleRepo = new GitSampleRepoRule();
 
-    @Ignore("fails: master gets build 4")
     @Issue("JENKINS-30206")
     @Test public void singleRepo() throws Exception {
         round1();