Skip to content

Commit a64d34b

Browse files
author
Eric Smalling
committed
Skipping non-windows compliant tests on Windows OS
1 parent 57bb09b commit a64d34b

File tree

3 files changed

+13
-0
lines changed

3 files changed

+13
-0
lines changed

src/test/java/org/jenkinsci/plugins/docker/workflow/DockerDSLTest.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,11 @@
5050
import org.jenkinsci.plugins.workflow.job.WorkflowJob;
5151
import org.jenkinsci.plugins.workflow.job.WorkflowRun;
5252
import org.jenkinsci.plugins.workflow.test.steps.SemaphoreStep;
53+
54+
import static org.jenkinsci.plugins.docker.workflow.DockerTestUtil.assumeNotWindows;
5355
import static org.junit.Assert.*;
5456
import static org.junit.Assume.*;
57+
5558
import org.junit.ClassRule;
5659
import org.junit.Rule;
5760
import org.junit.Test;
@@ -162,6 +165,8 @@ private static void grep(File dir, String text, String prefix, Set<String> match
162165
@Test public void endpoints() {
163166
story.addStep(new Statement() {
164167
@Override public void evaluate() throws Throwable {
168+
assumeNotWindows();
169+
165170
WorkflowJob p = story.j.jenkins.createProject(WorkflowJob.class, "prj");
166171
p.setDefinition(new CpsFlowDefinition(
167172
"docker.withServer('tcp://host:1234') {\n" +

src/test/java/org/jenkinsci/plugins/docker/workflow/DockerTestUtil.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@ public static void assumeDocker(VersionNumber minimumVersion) throws Exception {
5656
Assume.assumeFalse("Docker version not < " + minimumVersion.toString(), dockerClient.version().isOlderThan(minimumVersion));
5757
}
5858

59+
public static void assumeNotWindows() throws Exception {
60+
Assume.assumeFalse(System.getProperty("os.name").toLowerCase().contains("windows"));
61+
}
62+
5963
private DockerTestUtil() {}
6064

6165
}

src/test/java/org/jenkinsci/plugins/docker/workflow/ServerEndpointStepTest.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@
3939
import org.jenkinsci.plugins.workflow.structs.DescribableHelper;
4040
import org.jenkinsci.plugins.workflow.test.steps.SemaphoreStep;
4141
import org.junit.Test;
42+
43+
import static org.jenkinsci.plugins.docker.workflow.DockerTestUtil.assumeNotWindows;
4244
import static org.junit.Assert.*;
4345
import org.junit.ClassRule;
4446
import org.junit.Rule;
@@ -75,6 +77,8 @@ public class ServerEndpointStepTest {
7577
@Test public void variables() {
7678
story.addStep(new Statement() {
7779
@Override public void evaluate() throws Throwable {
80+
assumeNotWindows();
81+
7882
WorkflowJob p = story.j.jenkins.createProject(WorkflowJob.class, "prj");
7983
p.setDefinition(new CpsFlowDefinition(
8084
"node {\n" +

0 commit comments

Comments
 (0)