Repository: incubator-slider Updated Branches: refs/heads/feature/slider_install_package 9af04d6d4 -> 804788c33
SLIDER-407. Add install package command to install app packages Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/804788c3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/804788c3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/804788c3 Branch: refs/heads/feature/slider_install_package Commit: 804788c338e80381ae33049cdb79f4db25a378ec Parents: 9af04d6 Author: Sumit Mohanty <[email protected]> Authored: Mon Sep 8 16:45:08 2014 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Mon Sep 8 16:45:08 2014 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/slider/client/SliderClient.java | 2 +- .../apache/slider/agent/actions/TestActionInstallPackage.groovy | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/804788c3/slider-core/src/main/java/org/apache/slider/client/SliderClient.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java index 98074ec..8d0978c 100644 --- a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java +++ b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java @@ -628,7 +628,7 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe if (sliderFileSystem.getFileSystem().exists(fileInFs) && !installPkgInfo.replacePkg) { throw new BadCommandArgumentsException("Pkg exists at " + fileInFs.toUri().toString() + - ". Use --replacePkg true to overwrite."); + ". Use --replacePkg to overwrite."); } sliderFileSystem.getFileSystem().copyFromLocalFile(false, installPkgInfo.replacePkg, srcFile, fileInFs); http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/804788c3/slider-core/src/test/groovy/org/apache/slider/agent/actions/TestActionInstallPackage.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/agent/actions/TestActionInstallPackage.groovy b/slider-core/src/test/groovy/org/apache/slider/agent/actions/TestActionInstallPackage.groovy index 4d89e9b..88f1298 100644 --- a/slider-core/src/test/groovy/org/apache/slider/agent/actions/TestActionInstallPackage.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/agent/actions/TestActionInstallPackage.groovy @@ -103,7 +103,7 @@ class TestActionInstallPackage extends AgentMiniClusterTestBase { ) fail("expected an exception, got a status code " + launcher.serviceExitCode) } catch (BadCommandArgumentsException e) { - assert e.message.contains("Use --replacePkg true to overwrite") + assert e.message.contains("Use --replacePkg to overwrite") } } @@ -147,12 +147,11 @@ class TestActionInstallPackage extends AgentMiniClusterTestBase { SliderActions.ACTION_INSTALL_PACKAGE, Arguments.ARG_NAME, "hbase", Arguments.ARG_PACKAGE, "src/test/resources/log4j.properties", - Arguments.ARG_REPLACE_PKG, true + Arguments.ARG_REPLACE_PKG ], ) } catch (BadCommandArgumentsException e) { log.info(e.message) - assert e.message.contains("Use --replacePkg true to overwrite") } } }
