commit 6bb47b6eb9efdc705719a6f5b2b8939b32675a14
author Steve Loughran <stevel@apache.org> Mon Nov 10 00:05:19 2014 +0000
committer Steve Loughran <stevel@apache.org> Mon Nov 10 00:15:48 2014 +0000
tree 1f02099f7414815211d0f0b1862949431d24ea2d
parent 79452935fe60ce451ce4ad3299a1c4e71964516f

SLIDER-622 skipping tests of long-lived processes that only work on windows machines with the gnu toolchain on the classpath

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 @@
     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;

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 @@
 
   @Test
   public void testExitCodes() throws Throwable {
+    SliderTestUtils.skipOnWindows();
 
     initProcess(commandFactory.exitFalse());
     process.start();
@@ -93,6 +95,7 @@
 
   @Test
   public void testEcho() throws Throwable {
+    SliderTestUtils.skipOnWindows();
 
     String echoText = "hello, world";
     initProcess(commandFactory.echo(echoText));

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 @@
 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 @@
 
   @Test
   public void testExitCodes() throws Throwable {
+    SliderTestUtils.skipOnWindows();
 
     initProcess(commandFactory.exitFalse());
     exec();
@@ -93,7 +95,7 @@
 
   @Test
   public void testEcho() throws Throwable {
-
+    SliderTestUtils.skipOnWindows();
     String echoText = "hello, world";
     initProcess(commandFactory.echo(echoText));
     exec();