Repository: incubator-slider Updated Branches: refs/heads/develop 930920d24 -> e2a80326a
SLIDER-397 windows kill() command failing in TestStandaloneAMKill Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/132d9f28 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/132d9f28 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/132d9f28 Branch: refs/heads/develop Commit: 132d9f288a9d91790409bd4482731eb27cf58bba Parents: 930920d Author: Steve Loughran <ste...@apache.org> Authored: Thu Sep 4 20:31:29 2014 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Thu Sep 4 20:31:29 2014 +0100 ---------------------------------------------------------------------- .../apache/slider/agent/standalone/TestStandaloneAMKill.groovy | 2 +- .../groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/132d9f28/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAMKill.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAMKill.groovy b/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAMKill.groovy index 75f9a2c..7552394 100644 --- a/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAMKill.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAMKill.groovy @@ -58,7 +58,7 @@ class TestStandaloneAMKill extends AgentMiniClusterTestBase { describe("listing Java processes") lsJavaProcesses(); describe("killing AM") - killAM(SIGTERM); + assert 0 == killAM(SIGTERM); waitWhileClusterLive(sliderClient); //give yarn some time to notice sleep(10000) http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/132d9f28/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy b/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy index 7ffa64a..97cc853 100644 --- a/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy @@ -318,10 +318,10 @@ public abstract class YarnMiniClusterTestBase extends ServiceLauncherBaseTest { /** - * Kill all Slider Services. That i + * Kill all Slider Services. * @param signal */ - public void killAM(int signal) { + public int killAM(int signal) { killJavaProcesses(SliderAppMaster.SERVICE_CLASSNAME_SHORT, signal) }