Repository: incubator-slider Updated Branches: refs/heads/develop 1890c427b -> c806be2c5 refs/heads/releases/slider-0.60 a036ec112 -> 6bb47b6eb
SLIDER-622 skipping tests of long-lived processes that only work on windows machines with the gnu toolchain on the classpath Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/5898afd3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/5898afd3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/5898afd3 Branch: refs/heads/develop Commit: 5898afd32287842cb31022e686a9095e3c76c9e7 Parents: bdfdd84 Author: Steve Loughran <[email protected]> Authored: Mon Nov 10 00:05:19 2014 +0000 Committer: Steve Loughran <[email protected]> Committed: Mon Nov 10 00:09:17 2014 +0000 ---------------------------------------------------------------------- .../groovy/org/apache/slider/test/SliderTestUtils.groovy | 9 ++++++++- .../server/services/workflow/TestLongLivedProcess.java | 3 +++ .../services/workflow/TestWorkflowForkedProcessService.java | 4 +++- 3 files changed, 14 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5898afd3/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy b/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy index 87621a1..634b6b5 100644 --- a/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy @@ -189,7 +189,14 @@ class SliderTestUtils extends Assert { fail("Not implemented") } - + /** + * skip a test on windows + */ + public static void skipOnWindows() { + if (Shell.WINDOWS) { + skip("Not supported on windows") + } + } /** * Assert that any needed libraries being present. On Unix none are needed; http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5898afd3/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestLongLivedProcess.java ---------------------------------------------------------------------- diff --git a/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestLongLivedProcess.java b/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestLongLivedProcess.java index 9019124..545ba48 100644 --- a/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestLongLivedProcess.java +++ b/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestLongLivedProcess.java @@ -18,6 +18,7 @@ package org.apache.slider.server.services.workflow; +import org.apache.slider.test.SliderTestUtils; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -75,6 +76,7 @@ public class TestLongLivedProcess extends WorkflowServiceTestBase implements @Test public void testExitCodes() throws Throwable { + SliderTestUtils.skipOnWindows(); initProcess(commandFactory.exitFalse()); process.start(); @@ -93,6 +95,7 @@ public class TestLongLivedProcess extends WorkflowServiceTestBase implements @Test public void testEcho() throws Throwable { + SliderTestUtils.skipOnWindows(); String echoText = "hello, world"; initProcess(commandFactory.echo(echoText)); http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5898afd3/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestWorkflowForkedProcessService.java ---------------------------------------------------------------------- diff --git a/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestWorkflowForkedProcessService.java b/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestWorkflowForkedProcessService.java index e8f7d88..c8c576b 100644 --- a/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestWorkflowForkedProcessService.java +++ b/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestWorkflowForkedProcessService.java @@ -21,6 +21,7 @@ package org.apache.slider.server.services.workflow; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.service.ServiceOperations; import org.apache.slider.server.services.utility.EndOfServiceWaiter; +import org.apache.slider.test.SliderTestUtils; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -78,6 +79,7 @@ public class TestWorkflowForkedProcessService extends WorkflowServiceTestBase { @Test public void testExitCodes() throws Throwable { + SliderTestUtils.skipOnWindows(); initProcess(commandFactory.exitFalse()); exec(); @@ -93,7 +95,7 @@ public class TestWorkflowForkedProcessService extends WorkflowServiceTestBase { @Test public void testEcho() throws Throwable { - + SliderTestUtils.skipOnWindows(); String echoText = "hello, world"; initProcess(commandFactory.echo(echoText)); exec();
