[JENKINS-32179] Can enable test now.

jenkinsci · Nov 9, 2016 · 8773373 · 8773373
1 parent 56d24dc
commit 8773373
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/src/test/java/org/jenkinsci/plugins/workflow/multibranch/WorkflowMultiBranchProjectTest.java b/src/test/java/org/jenkinsci/plugins/workflow/multibranch/WorkflowMultiBranchProjectTest.java
@@ -58,7 +58,6 @@
 import org.jenkinsci.plugins.workflow.job.WorkflowRun;
 import static org.junit.Assert.*;
 import org.junit.ClassRule;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.BuildWatcher;
@@ -177,7 +176,6 @@ public DescriptorImpl() {
         }
     }
 
-    @Ignore("TODO cloudbees-folder 5.5+")
     @Issue("JENKINS-32179")
     @Test public void conflictingBranches() throws Exception {
         sampleRepo.init();