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 2015/06/05 10:32:59 UTC

[1/2] incubator-slider git commit: use assumeWindows() consistently in all TestWindowsSupport cases

Repository: incubator-slider
Updated Branches:
  refs/heads/develop 9f1f687b7 -> 8f3703ba3


use assumeWindows() consistently in all TestWindowsSupport cases


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/f70cc2c2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/f70cc2c2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/f70cc2c2

Branch: refs/heads/develop
Commit: f70cc2c22b6a88c8743a08ad29234b12f8c5850f
Parents: c746487
Author: Steve Loughran <st...@apache.org>
Authored: Fri Jun 5 09:32:13 2015 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Fri Jun 5 09:32:13 2015 +0100

----------------------------------------------------------------------
 .../org/apache/slider/common/tools/TestWindowsSupport.groovy       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f70cc2c2/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 230d519..a212f53 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
@@ -122,7 +122,7 @@ class TestWindowsSupport extends YarnMiniClusterTestBase {
 
   @Test
   public void testExecNonexistentBinary() throws Throwable {
-    assume(Shell.WINDOWS, "not windows")
+    assumeWindows()
     def commands = ["undefined-application", "--version"]
     try {
       exec(0, commands)


[2/2] incubator-slider git commit: Merge remote-tracking branch 'origin/develop' into develop

Posted by st...@apache.org.
Merge remote-tracking branch 'origin/develop' into develop


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/8f3703ba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/8f3703ba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/8f3703ba

Branch: refs/heads/develop
Commit: 8f3703ba36abc07d77d5ee671762628a489f8a07
Parents: f70cc2c 9f1f687
Author: Steve Loughran <st...@apache.org>
Authored: Fri Jun 5 09:32:48 2015 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Fri Jun 5 09:32:48 2015 +0100

----------------------------------------------------------------------
 .../providers/agent/AgentProviderService.java   |  16 ++-
 .../package/scripts/all.py                      |  11 +-
 .../package/scripts/cl.py                       |  13 +--
 .../package/scripts/COMMAND_LOGGER.py           |  17 ++-
 .../add-on-package-echo/package/scripts/echo.py |   7 +-
 .../appConfig.json                              |  22 ++++
 .../metainfo.xml                                |  42 ++++++++
 .../package/scripts/COMMAND_LOGGER.py           |  62 +++++++++++
 ...nentConfigsInAppConfigShowUpOnAgentIT.groovy | 106 +++++++++++++++++++
 .../ApplicationWithAddonPackagesIT.groovy       |   2 -
 10 files changed, 261 insertions(+), 37 deletions(-)
----------------------------------------------------------------------