Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #40 from jglick/test-JENKINS-32179
[JENKINS-32179] Can enable test now
  • Loading branch information
jglick committed Dec 1, 2016
2 parents 4134397 + 3538adf commit 4880dc4
Showing 1 changed file with 0 additions and 2 deletions.
Expand Up @@ -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;
Expand Down Expand Up @@ -177,7 +176,6 @@ public DescriptorImpl() {
}
}

@Ignore("TODO cloudbees-folder 5.5+")
@Issue("JENKINS-32179")
@Test public void conflictingBranches() throws Exception {
sampleRepo.init();
Expand Down

0 comments on commit 4880dc4

Please sign in to comment.