Repository: incubator-slider Updated Branches: refs/heads/feature/SLIDER-375_slider-core_tests_failing_on_windows [created] fbaea34f3
SLIDER-375 TestLongLivedProcess needed windows command translation Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/637293a2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/637293a2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/637293a2 Branch: refs/heads/feature/SLIDER-375_slider-core_tests_failing_on_windows Commit: 637293a2164def30f076fc7195046eb67941f4b6 Parents: 4d5783e Author: Steve Loughran <ste...@apache.org> Authored: Thu Aug 28 19:15:14 2014 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Thu Aug 28 19:15:14 2014 +0100 ---------------------------------------------------------------------- .../workflow/ProcessCommandFactory.java | 21 ++++++++++++++------ .../services/workflow/TestLongLivedProcess.java | 6 ++---- .../workflow/WorkflowServiceTestBase.java | 3 ++- 3 files changed, 19 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/637293a2/slider-core/src/test/java/org/apache/slider/server/services/workflow/ProcessCommandFactory.java ---------------------------------------------------------------------- diff --git a/slider-core/src/test/java/org/apache/slider/server/services/workflow/ProcessCommandFactory.java b/slider-core/src/test/java/org/apache/slider/server/services/workflow/ProcessCommandFactory.java index 45fdc86..4a19417 100644 --- a/slider-core/src/test/java/org/apache/slider/server/services/workflow/ProcessCommandFactory.java +++ b/slider-core/src/test/java/org/apache/slider/server/services/workflow/ProcessCommandFactory.java @@ -18,8 +18,11 @@ package org.apache.slider.server.services.workflow; +import org.apache.hadoop.util.Shell; + import java.io.File; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; /** @@ -37,10 +40,12 @@ public class ProcessCommandFactory { * @return commands */ public List<String> ls(File dir) { - List<String> commands = new ArrayList<String>(5); - commands.add("ls"); - commands.add("-1"); - commands.add(dir.getAbsolutePath()); + List<String> commands; + if (!Shell.WINDOWS) { + commands = Arrays.asList("ls","-1", dir.getAbsolutePath()); + } else { + commands = Arrays.asList("cmd", "/c", "dir", dir.getAbsolutePath()); + } return commands; } @@ -61,8 +66,12 @@ public class ProcessCommandFactory { * @return commands */ public List<String> env() { - List<String> commands = new ArrayList<String>(1); - commands.add("env"); + List<String> commands; + if (!Shell.WINDOWS) { + commands = Arrays.asList("env"); + } else { + commands = Arrays.asList("cmd", "/c", "set"); + } return commands; } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/637293a2/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 668bcca..9019124 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 @@ -33,11 +33,9 @@ import java.util.List; */ public class TestLongLivedProcess extends WorkflowServiceTestBase implements LongLivedProcessLifecycleEvent { - private static final Logger - log = LoggerFactory.getLogger(TestLongLivedProcess.class); + private static final Logger log = LoggerFactory.getLogger(TestLongLivedProcess.class); - private static final Logger - processLog = + private static final Logger processLog = LoggerFactory.getLogger("org.apache.hadoop.services.workflow.Process"); http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/637293a2/slider-core/src/test/java/org/apache/slider/server/services/workflow/WorkflowServiceTestBase.java ---------------------------------------------------------------------- diff --git a/slider-core/src/test/java/org/apache/slider/server/services/workflow/WorkflowServiceTestBase.java b/slider-core/src/test/java/org/apache/slider/server/services/workflow/WorkflowServiceTestBase.java index 3049d8f..f38bd9d 100644 --- a/slider-core/src/test/java/org/apache/slider/server/services/workflow/WorkflowServiceTestBase.java +++ b/slider-core/src/test/java/org/apache/slider/server/services/workflow/WorkflowServiceTestBase.java @@ -29,6 +29,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.List; +import java.util.Locale; import java.util.concurrent.Callable; /** @@ -122,7 +123,7 @@ public abstract class WorkflowServiceTestBase extends Assert { boolean found = false; StringBuilder builder = new StringBuilder(); for (String s : output) { - builder.append(s).append('\n'); + builder.append(s.toLowerCase(Locale.ENGLISH)).append('\n'); if (s.contains(text)) { found = true; break;
