Repository: incubator-slider Updated Branches: refs/heads/develop 227339e5c -> 29785f20c
SLIDER-657 Introduce --force switch for slider destroy command (fix fun tests) Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/29785f20 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/29785f20 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/29785f20 Branch: refs/heads/develop Commit: 29785f20ca30d65704aaff43d7841585a6ca43da Parents: 227339e Author: Gour Saha <[email protected]> Authored: Wed Nov 4 18:07:13 2015 -0800 Committer: Gour Saha <[email protected]> Committed: Wed Nov 4 18:07:55 2015 -0800 ---------------------------------------------------------------------- .../apache/slider/funtest/framework/AgentCommandTestBase.groovy | 3 ++- .../org/apache/slider/funtest/framework/CommandTestBase.groovy | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/29785f20/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/AgentCommandTestBase.groovy ---------------------------------------------------------------------- diff --git a/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/AgentCommandTestBase.groovy b/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/AgentCommandTestBase.groovy index 60d3ee2..12890b7 100644 --- a/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/AgentCommandTestBase.groovy +++ b/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/AgentCommandTestBase.groovy @@ -192,7 +192,8 @@ implements FuntestProperties, Arguments, SliderExitCodes, SliderActions { shell = slider([ ACTION_DESTROY, - applicationName]) + applicationName, + ARG_FORCE]) if (shell.ret != 0 && shell.ret != EXIT_UNKNOWN_INSTANCE) { assertExitCode(shell, 0) http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/29785f20/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy ---------------------------------------------------------------------- diff --git a/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy b/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy index 900b138..d3a6680 100644 --- a/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy +++ b/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy @@ -289,13 +289,13 @@ abstract class CommandTestBase extends SliderTestUtils { static SliderShell destroy(String name) { slider([ - ACTION_DESTROY, name + ACTION_DESTROY, name, ARG_FORCE ]) } static SliderShell destroy(int result, String name) { slider(result, [ - ACTION_DESTROY, name + ACTION_DESTROY, name, ARG_FORCE ]) }
