Repository: incubator-slider Updated Branches: refs/heads/develop 8f3703ba3 -> cbf227ab7
pull up TestWindowsSupport.assumeWindows() into SliderTestUtils; add alternate assumeNotWindows() Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/cbf227ab Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/cbf227ab Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/cbf227ab Branch: refs/heads/develop Commit: cbf227ab78cf427016f005b04d7f32d49a0f0e4a Parents: 8f3703b Author: Steve Loughran <ste...@apache.org> Authored: Fri Jun 5 09:35:40 2015 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Fri Jun 5 09:35:40 2015 +0100 ---------------------------------------------------------------------- .../slider/common/tools/TestWindowsSupport.groovy | 4 ---- .../org/apache/slider/test/SliderTestUtils.groovy | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/cbf227ab/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy b/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy index a212f53..cceb42b 100644 --- a/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy @@ -139,10 +139,6 @@ class TestWindowsSupport extends YarnMiniClusterTestBase { assert !doesAppExist(["undefined-application", "--version"]) } - public assumeWindows() { - assume(Shell.WINDOWS, "not windows") - } - @Test public void testEmitKillCommand() throws Throwable { http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/cbf227ab/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy b/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy index 4edce53..9d14815 100644 --- a/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy @@ -114,6 +114,20 @@ class SliderTestUtils extends Assert { } /** + * Skip a test if not running on Windows + */ + public assumeWindows() { + assume(Shell.WINDOWS, "not windows") + } + + /** + * Skip a test if running on Windows + */ + public assumeNotWindows() { + assume(!Shell.WINDOWS, "windows") + } + + /** * Equality size for a list * @param left * @param right