Permalink
Browse files

[JENKINS-32179] Can enable test now.

  • Loading branch information...
jglick committed Nov 9, 2016
1 parent 56d24dc commit 8773373ac64d669333080573724c4c8ffe186ea3
@@ -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();

0 comments on commit 8773373

Please sign in to comment.