SLIDER-622 simplify check for kill by just disabling it on windows test runs
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/90f6dd81 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/90f6dd81 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/90f6dd81 Branch: refs/heads/releases/slider-0.60 Commit: 90f6dd815a70d09dd9717f9fb9af1a7559165484 Parents: 00cf306 Author: Steve Loughran <[email protected]> Authored: Mon Nov 10 21:00:24 2014 +0000 Committer: Steve Loughran <[email protected]> Committed: Mon Nov 10 22:48:09 2014 +0000 ---------------------------------------------------------------------- .../org/apache/slider/test/YarnMiniClusterTestBase.groovy | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/90f6dd81/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 88fac06..96b1aae 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 @@ -210,11 +210,7 @@ public abstract class YarnMiniClusterTestBase extends ServiceLauncherBaseTest { */ @BeforeClass public static void checkKillSupport() { - if (!Shell.WINDOWS) { - kill_supported = true; - } else { - kill_supported = doesWindowsAppExist(["xargs", "--version"]) - } + kill_supported = !Shell.WINDOWS } /**
