SLIDER-863 fixes for TestAgentClientProvider2,TestPackageCommandOptions,TestActionPackage,TestActionExists
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/6997d0c7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/6997d0c7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/6997d0c7 Branch: refs/heads/develop Commit: 6997d0c77607cc0b050d4c297e7a9b82f1728020 Parents: 3df0453 Author: Steve Loughran <ste...@apache.org> Authored: Tue Apr 28 21:37:59 2015 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Tue Apr 28 21:37:59 2015 +0100 ---------------------------------------------------------------------- .../org/apache/slider/agent/actions/TestActionPackage.groovy | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/6997d0c7/slider-core/src/test/groovy/org/apache/slider/agent/actions/TestActionPackage.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/agent/actions/TestActionPackage.groovy b/slider-core/src/test/groovy/org/apache/slider/agent/actions/TestActionPackage.groovy index 021dd87..e977d68 100644 --- a/slider-core/src/test/groovy/org/apache/slider/agent/actions/TestActionPackage.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/agent/actions/TestActionPackage.groovy @@ -161,9 +161,7 @@ class TestActionPackage extends AgentMiniClusterTestBase { Arguments.ARG_NAME, "hbase", Arguments.ARG_PACKAGE, packageFile.absolutePath ], - ) - try { - + ) launcher = launchClientAgainstMiniMR( //config includes RM binding info new YarnConfiguration(miniCluster.config), @@ -175,7 +173,7 @@ class TestActionPackage extends AgentMiniClusterTestBase { Arguments.ARG_PACKAGE, packageFile.absolutePath, Arguments.ARG_REPLACE_PKG ], - ) + ) } catch (BadCommandArgumentsException e) { log.info(e.message) // throw e;