Merge SLIDER-653 test with some incompatibilities introduced by SLIDER-970; need to have a valid RM hostname or slider refuses to start. Fix: define one in the test command
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/90f1bba9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/90f1bba9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/90f1bba9 Branch: refs/heads/develop Commit: 90f1bba9a669986fbab3d8556a236de6970ff851 Parents: 2487fba Author: Steve Loughran <[email protected]> Authored: Mon Nov 23 17:19:36 2015 +0000 Committer: Steve Loughran <[email protected]> Committed: Mon Nov 23 17:19:36 2015 +0000 ---------------------------------------------------------------------- .../org/apache/slider/client/TestClientBadArgs.groovy | 9 ++++++--- .../groovy/org/apache/slider/test/SliderTestBase.groovy | 1 - 2 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/90f1bba9/slider-core/src/test/groovy/org/apache/slider/client/TestClientBadArgs.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/client/TestClientBadArgs.groovy b/slider-core/src/test/groovy/org/apache/slider/client/TestClientBadArgs.groovy index 17b176c..5cac590 100644 --- a/slider-core/src/test/groovy/org/apache/slider/client/TestClientBadArgs.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/client/TestClientBadArgs.groovy @@ -250,12 +250,15 @@ class TestClientBadArgs extends ServiceLauncherBaseTest { } @Test - public void testFlexWithNoCompoents() throws Throwable { + public void testFlexWithNoComponents() throws Throwable { def exception = launchExpectingException(SliderClient, new Configuration(), "Usage: slider flex <application>", - [SliderActions.ACTION_FLEX, - "flex1"]) + [ + SliderActions.ACTION_FLEX, + "flex1", + Arguments.ARG_DEFINE, YarnConfiguration.RM_ADDRESS + "=127.0.0.1:8032" + ]) assert exception instanceof UsageException log.info(exception.toString()) } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/90f1bba9/slider-core/src/test/groovy/org/apache/slider/test/SliderTestBase.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/test/SliderTestBase.groovy b/slider-core/src/test/groovy/org/apache/slider/test/SliderTestBase.groovy index 7a935dc..2b75c26 100644 --- a/slider-core/src/test/groovy/org/apache/slider/test/SliderTestBase.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/test/SliderTestBase.groovy @@ -44,7 +44,6 @@ public abstract class SliderTestBase extends SliderTestUtils { */ public static final MetricsAndMonitoring metrics = new MetricsAndMonitoring() public static final int WEB_STARTUP_TIME = 30000 - public static final byte[] NO_BYTES = new byte[0] @Rule public TestName methodName = new TestName();
