SLIDER-86: slider funtests call cmd /c slider.py on windows
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/1efc3583 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/1efc3583 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/1efc3583 Branch: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry Commit: 1efc35835bfb7615923411d420d2b61ce5d64ebc Parents: 8f6f15f Author: Steve Loughran <ste...@apache.org> Authored: Wed Sep 10 12:12:10 2014 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Wed Sep 10 12:12:10 2014 +0100 ---------------------------------------------------------------------- .../apache/slider/funtest/framework/CommandTestBase.groovy | 7 ++++++- .../apache/slider/funtest/framework/FuntestProperties.groovy | 1 + .../org/apache/slider/funtest/framework/SliderShell.groovy | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1efc3583/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy ---------------------------------------------------------------------- diff --git a/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy b/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy index 3b52912..b715e38 100644 --- a/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy +++ b/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy @@ -23,6 +23,7 @@ import org.apache.hadoop.conf.Configuration import org.apache.hadoop.fs.FileSystem as HadoopFS import org.apache.hadoop.fs.Path import org.apache.hadoop.util.ExitUtil +import org.apache.hadoop.util.Shell import org.apache.hadoop.yarn.conf.YarnConfiguration import org.apache.slider.core.main.ServiceLauncher import org.apache.slider.common.SliderKeys @@ -56,6 +57,9 @@ abstract class CommandTestBase extends SliderTestUtils { public static final File SLIDER_SCRIPT = new File( SLIDER_TAR_DIRECTORY, BIN_SLIDER).canonicalFile + public static final File SLIDER_SCRIPT_PYTHON = new File( + SLIDER_TAR_DIRECTORY, + BIN_SLIDER_PYTHON).canonicalFile public static final File SLIDER_CONF_DIRECTORY = new File( SLIDER_CONF_DIR).canonicalFile public static final File SLIDER_CONF_XML = new File(SLIDER_CONF_DIRECTORY, @@ -102,7 +106,8 @@ abstract class CommandTestBase extends SliderTestUtils { log.info "Security is off" } SliderShell.confDir = SLIDER_CONF_DIRECTORY - SliderShell.script = SLIDER_SCRIPT + SliderShell.script = Shell.WINDOWS ? SLIDER_SCRIPT_PYTHON : SLIDER_SCRIPT + log.info("Test using ${HadoopFS.getDefaultUri(SLIDER_CONFIG)} " + "and YARN RM @ ${SLIDER_CONFIG.get(YarnConfiguration.RM_ADDRESS)}") http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1efc3583/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/FuntestProperties.groovy ---------------------------------------------------------------------- diff --git a/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/FuntestProperties.groovy b/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/FuntestProperties.groovy index 1096dfa..730639b 100644 --- a/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/FuntestProperties.groovy +++ b/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/FuntestProperties.groovy @@ -57,6 +57,7 @@ public interface FuntestProperties extends SliderXMLConfKeysForTesting { String KEY_TEST_CONF_XML = "slider.test.conf.xml" String KEY_TEST_CONF_DIR = "slider.test.conf.dir" String BIN_SLIDER = "bin/slider" + String BIN_SLIDER_PYTHON = "bin/slider.py" String AGENT_INI = "agent.ini" String AGENT_INI_IN_SLIDER_TAR = "agent/conf/" + AGENT_INI http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1efc3583/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/SliderShell.groovy ---------------------------------------------------------------------- diff --git a/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/SliderShell.groovy b/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/SliderShell.groovy index 804e791..3d856c7 100644 --- a/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/SliderShell.groovy +++ b/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/SliderShell.groovy @@ -30,6 +30,7 @@ class SliderShell extends Shell { public static final String BASH = '/bin/bash -s' + public static final String CMD = 'cmd /c' /** * Configuration directory, shared across all instances. Not marked as volatile, @@ -48,7 +49,7 @@ class SliderShell extends Shell { * @param commands */ SliderShell(Collection<String> commands) { - super(BASH) + super(org.apache.hadoop.util.Shell.WINDOWS? CMD : BASH) assert confDir != null; assert script != null; command = script.absolutePath + " " + commands.join(" ")
