You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by sm...@apache.org on 2014/05/28 04:21:31 UTC
[26/44] git commit: SLIDER-38 clean up some funtest code
SLIDER-38 clean up some funtest code
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/9dfc71a6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/9dfc71a6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/9dfc71a6
Branch: refs/heads/master
Commit: 9dfc71a615b96719b3ac91c025ad3de40c9ecbe2
Parents: ef74e12
Author: Steve Loughran <st...@apache.org>
Authored: Sat May 24 14:18:18 2014 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Sat May 24 14:18:18 2014 +0100
----------------------------------------------------------------------
.../funtest/abstracttests/AbstractTestBuildSetup.groovy | 2 +-
.../slider/funtest/framework/CommandTestBase.groovy | 4 ++--
.../apache/slider/funtest/framework/ConfLoader.groovy | 3 +--
.../slider/funtest/framework/FuntestProperties.groovy | 11 +++++------
4 files changed, 9 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/9dfc71a6/slider-funtest/src/main/groovy/org/apache/slider/funtest/abstracttests/AbstractTestBuildSetup.groovy
----------------------------------------------------------------------
diff --git a/slider-funtest/src/main/groovy/org/apache/slider/funtest/abstracttests/AbstractTestBuildSetup.groovy b/slider-funtest/src/main/groovy/org/apache/slider/funtest/abstracttests/AbstractTestBuildSetup.groovy
index fba7461..c42589a 100644
--- a/slider-funtest/src/main/groovy/org/apache/slider/funtest/abstracttests/AbstractTestBuildSetup.groovy
+++ b/slider-funtest/src/main/groovy/org/apache/slider/funtest/abstracttests/AbstractTestBuildSetup.groovy
@@ -87,7 +87,7 @@ abstract class AbstractTestBuildSetup extends SliderTestUtils implements Funtest
* @return
*/
public Configuration loadSliderConf() {
- Configuration conf = (new ConfLoader()).loadSliderConf(confXML)
+ Configuration conf = ConfLoader.loadSliderConf(confXML)
return conf
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/9dfc71a6/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 c69b8ab..d0d7fc9 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
@@ -75,7 +75,7 @@ abstract class CommandTestBase extends SliderTestUtils {
static {
- SLIDER_CONFIG = new ConfLoader().loadSliderConf(SLIDER_CONF_XML);
+ SLIDER_CONFIG = ConfLoader.loadSliderConf(SLIDER_CONF_XML);
THAW_WAIT_TIME = getTimeOptionMillis(SLIDER_CONFIG,
KEY_TEST_THAW_WAIT_TIME,
1000 * DEFAULT_THAW_WAIT_TIME_SECONDS)
@@ -172,7 +172,7 @@ abstract class CommandTestBase extends SliderTestUtils {
* @return
*/
public static Configuration loadSliderConf() {
- Configuration conf = (new ConfLoader()).loadSliderConf(SLIDER_CONF_XML)
+ Configuration conf = ConfLoader.loadSliderConf(SLIDER_CONF_XML)
return conf
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/9dfc71a6/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/ConfLoader.groovy
----------------------------------------------------------------------
diff --git a/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/ConfLoader.groovy b/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/ConfLoader.groovy
index 8ef06cd..447ea87 100644
--- a/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/ConfLoader.groovy
+++ b/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/ConfLoader.groovy
@@ -18,12 +18,11 @@
package org.apache.slider.funtest.framework
-import org.apache.hadoop.conf.Configuration
import org.apache.hadoop.yarn.conf.YarnConfiguration
public class ConfLoader {
- YarnConfiguration loadSliderConf(File confFile) {
+ public static YarnConfiguration loadSliderConf(File confFile) {
URI confURI = confFile.toURI();
YarnConfiguration conf = new YarnConfiguration()
def confXmlUrl = confURI.toURL()
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/9dfc71a6/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 636da7b..8cbc098 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
@@ -1,9 +1,3 @@
-package org.apache.slider.funtest.framework
-
-import groovy.transform.CompileStatic
-import org.apache.slider.common.SliderXMLConfKeysForTesting
-import org.apache.slider.common.SliderKeys
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -21,6 +15,11 @@ import org.apache.slider.common.SliderKeys
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+package org.apache.slider.funtest.framework
+
+import groovy.transform.CompileStatic
+import org.apache.slider.common.SliderXMLConfKeysForTesting
+import org.apache.slider.common.SliderKeys
/**
* Properties unique to the functional tests