You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by jm...@apache.org on 2014/09/08 15:30:41 UTC
[25/50] git commit: SLIDER-377 AM checks for validity of server side;
client does this if the CLI action says it should (default is yes)
SLIDER-377 AM checks for validity of server side; client does this if the CLI action says it should (default is yes)
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/01642770
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/01642770
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/01642770
Branch: refs/heads/feature/update_storm_for_93
Commit: 0164277025ce3f8ec0a53b4dbd1005967632262e
Parents: b636180
Author: Steve Loughran <st...@apache.org>
Authored: Thu Sep 4 17:04:46 2014 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Thu Sep 4 17:04:46 2014 +0100
----------------------------------------------------------------------
.../apache/slider/providers/agent/AgentTestBase.groovy | 10 ++++++++++
.../minicluster/masterless/TestRoleOptPropagation.groovy | 4 +---
2 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/01642770/slider-core/src/test/groovy/org/apache/slider/providers/agent/AgentTestBase.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/providers/agent/AgentTestBase.groovy b/slider-core/src/test/groovy/org/apache/slider/providers/agent/AgentTestBase.groovy
index 6dee64f..2953381 100644
--- a/slider-core/src/test/groovy/org/apache/slider/providers/agent/AgentTestBase.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/providers/agent/AgentTestBase.groovy
@@ -26,9 +26,11 @@ import org.apache.commons.compress.utils.IOUtils
import org.apache.hadoop.yarn.conf.YarnConfiguration
import org.apache.slider.client.SliderClient
import org.apache.slider.common.params.SliderActions
+import org.apache.slider.common.tools.SliderUtils
import org.apache.slider.core.main.ServiceLauncher
import org.apache.slider.test.YarnZKMiniClusterTestBase
import org.junit.Before
+import org.junit.BeforeClass
import org.junit.Rule
import org.junit.rules.TemporaryFolder
@@ -47,6 +49,14 @@ public abstract class AgentTestBase extends YarnZKMiniClusterTestBase {
@Rule
public TemporaryFolder folder = new TemporaryFolder();
+ /**
+ * Server side test: validate system env before launch
+ */
+ @BeforeClass
+ public static void checkSystem() {
+ SliderUtils.validateSliderServerEnvironment(null)
+ }
+
public String app_def_pkg_path;
@Before
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/01642770/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/masterless/TestRoleOptPropagation.groovy
----------------------------------------------------------------------
diff --git a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/masterless/TestRoleOptPropagation.groovy b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/masterless/TestRoleOptPropagation.groovy
index cffde39..dd9b8e9 100644
--- a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/masterless/TestRoleOptPropagation.groovy
+++ b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/masterless/TestRoleOptPropagation.groovy
@@ -30,8 +30,6 @@ import org.apache.slider.providers.hbase.minicluster.HBaseMiniClusterTestBase
import org.apache.slider.core.main.ServiceLauncher
import org.junit.Test
-import static HBaseKeys.PROVIDER_HBASE
-import static Arguments.ARG_PROVIDER
@CompileStatic
@Slf4j
@@ -54,7 +52,7 @@ class TestRoleOptPropagation extends HBaseMiniClusterTestBase {
],
[
Arguments.ARG_COMP_OPT, HBaseKeys.ROLE_MASTER, ENV, "4",
- ARG_PROVIDER, PROVIDER_HBASE
+ Arguments.ARG_PROVIDER, HBaseKeys.PROVIDER_HBASE
],
true,
true,