You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2014/11/25 20:20:18 UTC
[2/2] incubator-slider git commit: SLIDER-680 cut test option to
choose between shell and .py script as obsolete
SLIDER-680 cut test option to choose between shell and .py script as obsolete
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/f0a30fd9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/f0a30fd9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/f0a30fd9
Branch: refs/heads/develop
Commit: f0a30fd9fff7353dbb6b9e376be19a79e9f10064
Parents: a450743
Author: Steve Loughran <st...@apache.org>
Authored: Tue Nov 25 17:14:32 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Tue Nov 25 17:14:32 2014 +0000
----------------------------------------------------------------------
.../apache/slider/funtest/framework/CommandTestBase.groovy | 7 ++-----
.../apache/slider/funtest/framework/FuntestProperties.groovy | 4 ----
2 files changed, 2 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f0a30fd9/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 1cb245a..b3959af 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
@@ -121,8 +121,6 @@ abstract class CommandTestBase extends SliderTestUtils {
TEST_AM_KEYTAB = SLIDER_CONFIG.getTrimmed(
KEY_TEST_AM_KEYTAB)
-
-
TILDE = Shell.WINDOWS? "~" : "\\~"
}
@@ -137,11 +135,10 @@ abstract class CommandTestBase extends SliderTestUtils {
SliderShell.confDir = SLIDER_CONF_DIRECTORY
- // choose python script if on windows or the launch key recommends it
+ // choose python script if on windows
//
- boolean python = SLIDER_CONFIG.getBoolean(KEY_LAUNCH_PYTHON, false)
SliderShell.scriptFile =
- (SliderShell.windows || python) ? SLIDER_SCRIPT_PYTHON : SLIDER_SCRIPT
+ SliderShell.windows ? SLIDER_SCRIPT_PYTHON : SLIDER_SCRIPT
//set the property of the configuration directory
def path = SLIDER_CONF_DIRECTORY.absolutePath
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f0a30fd9/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 92a7a95..2b13d13 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
@@ -75,8 +75,4 @@ public interface FuntestProperties extends SliderXMLConfKeysForTesting {
String HDFS_SITE_XML = "hdfs-site.xml"
String YARN_SITE_XML = "yarn-site.xml"
- /**
- * Flag to indicate that the .py script should be launched: {@value}
- */
- String KEY_LAUNCH_PYTHON = "slider.test.launch.python"
}