You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2014/12/18 22:32:48 UTC
[40/50] incubator-slider git commit: SLIDER-151 better functional
test stop (don't force, hence doesn't appear in RM as killed)
SLIDER-151 better functional test stop (don't force, hence doesn't appear in RM as killed)
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/8e18403c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/8e18403c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/8e18403c
Branch: refs/heads/feature/SLIDER-151_REST_API
Commit: 8e18403c92ad1f11817e2175e85d304f2de7ad72
Parents: e654a0f
Author: Steve Loughran <st...@apache.org>
Authored: Tue Dec 16 20:25:07 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Tue Dec 16 20:25:40 2014 +0000
----------------------------------------------------------------------
.../slider/funtest/framework/AgentCommandTestBase.groovy | 8 +++++---
.../apache/slider/funtest/framework/CommandTestBase.groovy | 9 +++++++++
2 files changed, 14 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/8e18403c/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 668a264..832f855 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
@@ -159,14 +159,16 @@ implements FuntestProperties, Arguments, SliderExitCodes, SliderActions {
describe "Teardown app instance " + applicationName
// forced freeze with wait
+ SliderShell shell
+ shell = stop(applicationName)
teardown(applicationName)
- SliderShell shell = slider([
+
+ shell = slider([
ACTION_DESTROY,
applicationName])
if (shell.ret != 0 && shell.ret != EXIT_UNKNOWN_INSTANCE) {
- logShell(shell)
- assert fail("Old cluster either should not exist or should get destroyed; destroy exit code = ${shell.ret}")
+ assertExitCode(shell, 0)
}
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/8e18403c/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 4757d77..143d284 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
@@ -345,6 +345,15 @@ abstract class CommandTestBase extends SliderTestUtils {
freeze(name, [ARG_FORCE, ARG_WAIT, "10000"])
}
+ /**
+ * Non-forced stop, wait some seconds
+ * @param name
+ * @return
+ */
+ static SliderShell stop(String name) {
+ freeze(name, [ARG_WAIT, "10000"])
+ }
+
static SliderShell killContainer(String name, String containerID) {
slider(0,
[