SLIDER-656 remove hbase/accumulo provider test constants
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/419c5c08 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/419c5c08 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/419c5c08 Branch: refs/heads/develop Commit: 419c5c0897d1afedf739537e41cc87345fc622bb Parents: 5d40554 Author: Steve Loughran <[email protected]> Authored: Wed Nov 26 18:34:51 2014 +0000 Committer: Steve Loughran <[email protected]> Committed: Wed Nov 26 18:34:51 2014 +0000 ---------------------------------------------------------------------- .../common/SliderXMLConfKeysForTesting.java | 8 -------- .../slider/test/YarnMiniClusterTestBase.groovy | 19 ------------------- 2 files changed, 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/419c5c08/slider-core/src/main/java/org/apache/slider/common/SliderXMLConfKeysForTesting.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/common/SliderXMLConfKeysForTesting.java b/slider-core/src/main/java/org/apache/slider/common/SliderXMLConfKeysForTesting.java index eb55c71..41c61d4 100644 --- a/slider-core/src/main/java/org/apache/slider/common/SliderXMLConfKeysForTesting.java +++ b/slider-core/src/main/java/org/apache/slider/common/SliderXMLConfKeysForTesting.java @@ -43,14 +43,6 @@ public interface SliderXMLConfKeysForTesting { int DEFAULT_TEST_TIMEOUT_SECONDS = 30 * 60; - String KEY_TEST_HBASE_LAUNCH_TIME = "slider.test.hbase.launch.wait.seconds"; - - int DEFAULT_HBASE_LAUNCH_TIME_SECONDS = 60 * 3; - - String KEY_TEST_HBASE_ENABLED = "slider.test.hbase.enabled"; - - String KEY_TEST_ACCUMULO_ENABLED = "slider.test.accumulo.enabled"; - String KEY_ACCUMULO_LAUNCH_TIME = "slider.test.accumulo.launch.wait.seconds"; int DEFAULT_ACCUMULO_LAUNCH_TIME_SECONDS = 60 * 3; http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/419c5c08/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy b/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy index 856ad11..9fb75df 100644 --- a/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy @@ -103,14 +103,6 @@ public abstract class YarnMiniClusterTestBase extends ServiceLauncherBaseTest { public int freezeWaitTime = DEFAULT_TEST_FREEZE_WAIT_TIME_SECONDS * 1000 public int sliderTestTimeout = DEFAULT_TEST_TIMEOUT_SECONDS * 1000 public boolean teardownKillall = DEFAULT_TEARDOWN_KILLALL - - - public boolean accumuloTestsEnabled = true - public int accumuloLaunchWaitTime = DEFAULT_ACCUMULO_LAUNCH_TIME_SECONDS * 1000 - - public boolean hbaseTestsEnabled = true - public int hbaseLaunchWaitTime = DEFAULT_HBASE_LAUNCH_TIME_SECONDS * 1000 - protected MiniDFSCluster hdfsCluster protected MiniYARNCluster miniCluster @@ -175,17 +167,6 @@ public abstract class YarnMiniClusterTestBase extends ServiceLauncherBaseTest { testConf.getBoolean(KEY_TEST_TEARDOWN_KILLALL, teardownKillall) - hbaseTestsEnabled = - testConf.getBoolean(KEY_TEST_HBASE_ENABLED, hbaseTestsEnabled) - hbaseLaunchWaitTime = getTimeOptionMillis(testConf, - KEY_TEST_HBASE_LAUNCH_TIME, - hbaseLaunchWaitTime) - - accumuloTestsEnabled = - testConf.getBoolean(KEY_TEST_ACCUMULO_ENABLED, accumuloTestsEnabled) - accumuloLaunchWaitTime = getTimeOptionMillis(testConf, - KEY_ACCUMULO_LAUNCH_TIME, - accumuloLaunchWaitTime) } @After
