| commit | f0a30fd9fff7353dbb6b9e376be19a79e9f10064 | [log] [tgz] |
|---|---|---|
| author | Steve Loughran <stevel@apache.org> | Tue Nov 25 17:14:32 2014 +0000 |
| committer | Steve Loughran <stevel@apache.org> | Tue Nov 25 17:14:32 2014 +0000 |
| tree | 7c9d30254b5dbd6811c9f1c38af4382205aa05b0 | |
| parent | a450743964f67ca2546b211ae27836fb0142f4b2 [diff] |
SLIDER-680 cut test option to choose between shell and .py script as obsolete
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 @@ TEST_AM_KEYTAB = SLIDER_CONFIG.getTrimmed( KEY_TEST_AM_KEYTAB) - - TILDE = Shell.WINDOWS? "~" : "\\~" } @@ -137,11 +135,10 @@ 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
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 @@ 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" }